From: Mario <zacjardine@y7mail.com>
Date: Tue, 19 Sep 2017 15:07:36 +0000 (+0000)
Subject: Merge branch 'martin-t/dmgtextconfig' into 'master'
X-Git-Tag: xonotic-v0.8.5~2464
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85f869a08c7ff9c05708811d1c80776f0cf10924;p=xonotic%2Fxonotic-data.pk3dir.git

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

Put sv_damagetext to defaultServer so that resetting server reenables damagetext too

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

85f869a08c7ff9c05708811d1c80776f0cf10924