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)
commitaaa298baa3cffa029d5f1c03a834549861fe31b1
tree4cffc4c649f546f408cd9330e6f75c0a5e800c95
parent2825e7aea2e8989a262302351d2848fff61312b8
parentc4b22916000f124ade94977e91f4fa2cc125d0c7
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/bot/default/bot.qc