]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:19:05 +0000 (12:19 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:19:05 +0000 (12:19 +0300)
commit2ebd6368ddb2c18dee6195824033f8916fc983af
treef210ba882ec8cf8b51a5ed8cdc54862e6ea6b0e4
parent3d8cfa024224031606f03102a4e521a23cd26d94
parent8c1b0e27f131c21a6004c2e43749a4b7ef317eb4
Merge branch 'master' into Lyberta/GunGame
qcsrc/client/hud/panel/modicons.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc