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)
1  2 
qcsrc/server/bot/default/bot.qc

Simple merge