]> 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: 6c41ae7 91df8ac)
Merge branch 'martin-t/settings' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:36:33 +0000 (05:36 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:36:33 +0000 (05:36 +0000)
Clean up damagetext settings

See merge request xonotic/xonotic-data.pk3dir!638


Trivial merge