From: terencehill <piuntn@gmail.com>
Date: Sun, 4 Nov 2018 12:42:59 +0000 (+0000)
Subject: Merge branch 'martin-t/dmgtext' into 'master'
X-Git-Tag: xonotic-v0.8.5~1729
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b23faa9ffebcfa148da45d0c4b2e4d96b1a3cfb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/dmgtext' into 'master'

Damagetext improvements

Closes #1983

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

1b23faa9ffebcfa148da45d0c4b2e4d96b1a3cfb