Merge branch 'master' into terencehill/bot_waypoints

author terencehill <piuntn@gmail.com>

Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
author terencehill <piuntn@gmail.com>
Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
diff --cc qcsrc/common/triggers/trigger/jumppads.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 10 Apr 2018 10:17:42 +0000 (12:17 +0200)