]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/t_items.qc

Simple merge
Simple merge
Simple merge