]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07fa746 354c011)
Merge branch 'martin-t/dmgtext2' into 'master'
authorterencehill <piuntn@gmail.com>
Sun, 9 Jul 2017 00:59:54 +0000 (00:59 +0000)
committerterencehill <piuntn@gmail.com>
Sun, 9 Jul 2017 00:59:54 +0000 (00:59 +0000)
2D damagetext

Closes #1716

See merge request !439


Trivial merge