Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 6 May 2017 23:02:48 +0000 (01:02 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 6 May 2017 23:02:48 +0000 (01:02 +0200)
1  2 
qcsrc/server/bot/default/bot.qc

Simple merge