]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 10:52:58 +0000 (13:52 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 6 Jun 2018 10:52:58 +0000 (13:52 +0300)
commita05e216d81dd650e449bee5f717c52c4d0ecce55
tree31ab5b9712aeafd187298ec208e4f483d4f1158a
parent2ebd6368ddb2c18dee6195824033f8916fc983af
parent033d44f4bc134eae5f0d65f75d1807159d6042cd
Merge branch 'master' into Lyberta/GunGame
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc