]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/defaults' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:01 +0000 (20:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:01 +0000 (20:33 +0200)
commit027edd58ecaf02c8b8f4aa1c3e398eed33460037
tree0449c230717c38f93b12aa172235741f4eb41ec6
parent45724cf86a9a34bae6f39c4ada945e6ffd5c73ec
parent95937ae37fa11b874cffe08cec6b52cf4e39bc12
Merge branch 'martin-t/defaults' into martin-t/master2
gamemodes-server.cfg