]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:10:19 +0000 (13:10 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:10:19 +0000 (13:10 +0300)
commit56f236eb6d15377f92cab55ff6799f54eb9260c1
treed15a67893d61c25059b41d792477effc6d5b98a4
parenta22cbff0e1d4a93141e02410f27d0db78d72139d
parentb2e3660c5c919d8be9594934e8f6eec9b82346a3
Merge branch 'master' into Lyberta/GunGame
qcsrc/common/mapinfo.qh
qcsrc/server/g_world.qc