Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
1  2 
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/waypoints.qc

Simple merge