Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)

committer Lyberta <lyberta@lyberta.net>

Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)
author Lyberta <lyberta@lyberta.net>
Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)
committer Lyberta <lyberta@lyberta.net>
Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)
diff --cc qcsrc/server/mutators/mutator/gamemode_survival.qc
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sun, 4 Jun 2017 15:23:29 +0000 (18:23 +0300)