]> 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: b4c43a7 9a93c94)
Merge branch 'martin-t/dmgtext' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 4 Nov 2018 12:42:59 +0000 (12:42 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 4 Nov 2018 12:42:59 +0000 (12:42 +0000)
Damagetext improvements

Closes #1983

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


Trivial merge