]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:29:07 +0000 (15:29 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 12:29:07 +0000 (15:29 +0300)
commit215f663f99a2f8aa522a9d04b76633de737a28f5
treea54f3183f1f74fa658a2923ea32bad1045ae3718
parent247f3e7a76caa83ce6faeec1e0f5d782a88f9fb0
parent9be3f6510645395f6b6dbfab2e2f32d17f0bd8e3
Merge branch 'Lyberta/Survival' into Lyberta/master
gamemodes-server.cfg
mutators.cfg
qcsrc/client/hud/panel/modicons.qc
qcsrc/menu/xonotic/keybinder.qc
qcsrc/server/g_world.qc