Merge branch 'master' into terencehill/bot_AI_improvements
authorterencehill <piuntn@gmail.com>
Thu, 9 Feb 2017 12:58:13 +0000 (13:58 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 9 Feb 2017 12:58:13 +0000 (13:58 +0100)
commit6147159b612c6950ca2177b732028d1116201220
tree5c0b63def2d1904b80c094e3fa89b76ed029699f
parent7ca1d66af4b7d36f2e036100ba6183fff7213829
parent514256825ee2f7471234151b2d2bb594c265d0b5
Merge branch 'master' into terencehill/bot_AI_improvements
qcsrc/server/bot/default/bot.qc