Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)

committer Lyberta <lyberta@lyberta.net>

Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)
author Lyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)
committer Lyberta <lyberta@lyberta.net>
Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)
diff --cc qcsrc/server/mutators/mutator/gamemode_survival.qc
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Mon, 28 Aug 2017 00:05:02 +0000 (03:05 +0300)