Merge branch 'Lyberta/Survival' into Lyberta/master

author Lyberta <lyberta@lyberta.net>

Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)

committer Lyberta <lyberta@lyberta.net>

Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
author Lyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
committer Lyberta <lyberta@lyberta.net>
Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
diff --cc qcsrc/common/items/item.qh
Simple merge
diff --cc qcsrc/common/items/item/powerup.qh
Simple merge
diff --cc qcsrc/common/mutators/mutator/waypoints/all.inc
Simple merge
diff --cc qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
Simple merge
diff --cc qcsrc/common/physics/player.qh
Simple merge
author	Lyberta <lyberta@lyberta.net>
	Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Wed, 22 Aug 2018 10:37:22 +0000 (13:37 +0300)
		1	2
qcsrc/common/items/item.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/items/item/powerup.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/all.inc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics/player.qh	patch \|	diff1 \|	diff2 \|	blob \| history