From: Mario <zacjardine@y7mail.com>
Date: Sat, 6 May 2017 20:32:17 +0000 (+0000)
Subject: Merge branch 'martin-t/dmgtext' into 'master'
X-Git-Tag: xonotic-v0.8.5~2796
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c5b2732b2c36867791ee04aa76de6c766a52a039;p=xonotic%2Fxonotic-data.pk3dir.git

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

Split damagetext into server/client/ui

See merge request !438
---

c5b2732b2c36867791ee04aa76de6c766a52a039