Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 22 Oct 2018 15:38:04 +0000 (17:38 +0200)
commita692581c23cc689f1f695dd04b6b2a2b27a567f0
tree6e84bcd97aff8cf9ab6a90d19cde3d8cc8616402
parent67640b0804cc24139ce91a7a61cd2ca8c3891913
parentd9ddf453dcd3f6e4cce5dbe394fd7936048ea6ad
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/waypoints.qc