]> 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: 8fc773a bdb4a51)
Merge branch 'Mario/target_items_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Jan 2015 02:55:48 +0000 (02:55 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Jan 2015 02:55:48 +0000 (02:55 +0000)
Merge branch Mario/target_items_fix (XXS merge request)

Fixes target_items not compatible with old weapon names.

See merge request !96


Trivial merge