From: terencehill <piuntn@gmail.com>
Date: Sun, 9 Jul 2017 00:59:54 +0000 (+0000)
Subject: Merge branch 'martin-t/dmgtext2' into 'master'
X-Git-Tag: xonotic-v0.8.5~2656
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90b55a65862014d4147a4cc951e2c89e1139cb4e;p=xonotic%2Fxonotic-data.pk3dir.git

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

2D damagetext

Closes #1716

See merge request !439
---

90b55a65862014d4147a4cc951e2c89e1139cb4e