]> 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 | compact (merge: 907f3aa 8b389a7)
Merge branch 'martin-t/dmgtext' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 6 May 2017 20:32:17 +0000 (20:32 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 6 May 2017 20:32:17 +0000 (20:32 +0000)
Split damagetext into server/client/ui

See merge request !438


Trivial merge