Merge branch 'master' into terencehill/bot_waypoints
authorterencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 17 Jul 2017 22:23:08 +0000 (00:23 +0200)
commitcabba6eeb71f3ca612aa30bb8c7dad9cbc9c0d52
treec76908e01e3b6f45d438180b308956bc6d57e3ec
parent583ff2fd202086e9cccd53071a5b88371b8d9dd1
parentcd2e3f4efb8e5f3c7db8b6c1654ee2c6a1eea05a
Merge branch 'master' into terencehill/bot_waypoints
qcsrc/server/bot/default/bot.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/impulse.qc