Merge branch 'master' into terencehill/bot_fix
authorterencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 29 Dec 2016 01:59:28 +0000 (02:59 +0100)
commit228743a67588c5488f678a9d0ead45bf8a50b6c2
tree3d2d4702798cac826cb5e782b520428b26816095
parent66fc0a87a9436d3ae5363d854c509f8a496dceea
parentdeafac153144404a737025eb09843495f8f1f0d2
Merge branch 'master' into terencehill/bot_fix
qcsrc/common/t_items.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/bot/default/navigation.qc