]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/seta' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:06 +0000 (20:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:06 +0000 (20:33 +0200)
commit40de0d6f065f2338085e4197dcb20e5c647d4924
tree3f3a03d549666438d550a196eb1d50436337e1d9
parent027edd58ecaf02c8b8f4aa1c3e398eed33460037
parentae851653541ad0471fa2e72ef83cbdf49271b82e
Merge branch 'martin-t/seta' into martin-t/master2
gamemodes-server.cfg