Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000 (15:39 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 1 Dec 2017 14:39:56 +0000 (15:39 +0100)
1  2 
qcsrc/common/triggers/teleporters.qc
qcsrc/common/triggers/trigger/jumppads.qc
qcsrc/server/bot/default/havocbot/roles.qc

Simple merge