Merge branch 'master' into terencehill/bot_AI_improvements
authorterencehill <piuntn@gmail.com>
Mon, 13 Feb 2017 21:28:26 +0000 (22:28 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 13 Feb 2017 21:28:26 +0000 (22:28 +0100)
commit30e724fe1e818fa1a1e57250f260f7141f1f379b
treef33311653c60cdc4b7145cb9dd6e71ffa1141e91
parentdf7cc0f9e47327aa077613f6fd16f63f62b2c255
parent2f9218ac3d95f1bcca81a6421bcf21facf1759f9
Merge branch 'master' into terencehill/bot_AI_improvements
qcsrc/common/t_items.qc