Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)

committer Lyberta <lyberta@lyberta.net>

Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)
author Lyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)
committer Lyberta <lyberta@lyberta.net>
Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)
diff --cc qcsrc/common/mutators/mutator/waypoints/all.inc
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Mon, 16 Jul 2018 13:35:42 +0000 (16:35 +0300)