Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
1  2 
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/impulse.qc

Simple merge
Simple merge
Simple merge