Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sun, 13 Aug 2017 15:43:51 +0000 (17:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 13 Aug 2017 15:43:51 +0000 (17:43 +0200)
1  2 
qcsrc/server/bot/api.qh
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/havocbot/roles.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/bot/default/waypoints.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge