From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Jun 2019 05:36:33 +0000 (+0000)
Subject: Merge branch 'martin-t/settings' into 'master'
X-Git-Tag: xonotic-v0.8.5~1475
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f24c1ab39321a756bb76d1699a775fe1e42040ab;p=xonotic%2Fxonotic-data.pk3dir.git

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

Clean up damagetext settings

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

f24c1ab39321a756bb76d1699a775fe1e42040ab