Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)

committer Lyberta <lyberta@lyberta.net>

Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
author Lyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
committer Lyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/menu/xonotic/util.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Mon, 9 Apr 2018 01:38:00 +0000 (04:38 +0300)
		1	2
qcsrc/client/hud/panel/modicons.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/xonotic/util.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	patch \|	diff1 \|	diff2 \|	blob \| history