Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)

committer Lyberta <lyberta@lyberta.net>

Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)
author Lyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)
committer Lyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)
diff --cc qcsrc/client/view.qc
Simple merge
diff --cc qcsrc/common/mutators/mutator/overkill/sv_overkill.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>
	Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sat, 2 Dec 2017 15:56:47 +0000 (18:56 +0300)
		1	2
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/overkill/sv_overkill.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