]> 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: 664d85a ce9b18c)
Merge branch 'terencehill/damagetext_cleanup' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 27 Jan 2016 20:56:59 +0000 (20:56 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 27 Jan 2016 20:56:59 +0000 (20:56 +0000)
damagetext cleanup

See merge request !274


Trivial merge