Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000 (11:44 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 15 Jul 2017 09:44:46 +0000 (11:44 +0200)
commit583ff2fd202086e9cccd53071a5b88371b8d9dd1
treeb6ef7061b25d3aafe60b0ec19df8e5e5f62e1423
parentd140b8ba15a77f8e605ba8d188791273fc375bd1
parentb14c4594291cb19b39863bf1d6876bd4304ec90d
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/sv_main.qc