]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 06:42:51 +0000 (09:42 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 17 Feb 2018 06:42:51 +0000 (09:42 +0300)
commit9adbead408ffe659813aaec0d6753dad3d79c433
treeaf3e0e262d643422ebda07c710c7e41d8c840b1a
parent83093a5626b3ec25a2dc4f87b24eda2a95a8335f
parentbebef6b9a1c5d5d79cb9cf11180dbb6cda6fcd29
Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
defaultServer.cfg