]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
commit199b9c72879174ddd73efcdbfeb9735e4ef6a56e
tree8953846d6bb650fdc23dfabe83378be189c9638f
parent2740575b7d2a382faeec12930362c01f5e5051bb
parentbb23524f541a5c56b9a055070bb4c0d86e6db9e6
Merge branch 'Lyberta/Survival' into Lyberta/master
qcsrc/client/hud/panel/modicons.qc
qcsrc/client/view.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc