Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Wed, 31 Jul 2019 21:02:43 +0000 (23:02 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 31 Jul 2019 21:02:43 +0000 (23:02 +0200)
commit772fb683d951a622cc8520827096ec34fdea4763
treee4c9c1342b23357ac555b4d504ff64c16f2927ba
parent1360fcdfa2ed733ccda22b2974c3e1bafd20c93c
parentd3c2728fcdf32660fbc629615e8207701b03962c
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/waypoints.qc