]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Wed, 31 Oct 2018 22:40:59 +0000 (01:40 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 31 Oct 2018 22:40:59 +0000 (01:40 +0300)
commit7730016ead81ff7164134a0371e97f1bbe27955d
tree788baa508a384f57a3ab770f23e7f7d0ba662daa
parenta84ccd8d47f909961062c76a3c442bf300b0a5ac
parentd85229fb1f3ad8745d902584a849eb38ff265ce1
Merge branch 'master' into Lyberta/GunGame
gamemodes-server.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/common/gamemodes/gamemode/_mod.inc
qcsrc/common/gamemodes/gamemode/_mod.qh
qcsrc/common/mapinfo.qh
qcsrc/common/notifications/all.inc
qcsrc/common/notifications/all.qh
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc