Merge branch 'master' into terencehill/bot_item_rating
authorterencehill <piuntn@gmail.com>
Mon, 30 Jan 2017 10:44:23 +0000 (11:44 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 30 Jan 2017 10:44:23 +0000 (11:44 +0100)
commit0e2e3f299aa767d90e93eab4815ea6acafa7b956
treef3e5d98e54289bd2c9b566916f83b75881136cb5
parent1b9fbea6e5ef24f649deed64850a6a2a65e72d98
parentbb12a18bafa6e3cd4f0304d2856a87887c8c9287
Merge branch 'master' into terencehill/bot_item_rating
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/t_items.qc