]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b9fbea bb12a18)
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 patch | diff1 | diff2 | blob | history
qcsrc/common/items/item/health.qh patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/items/item/armor.qh
Simple merge
diff --cc qcsrc/common/items/item/health.qh
Simple merge
diff --cc qcsrc/common/t_items.qc
Simple merge