From: terencehill <piuntn@gmail.com>
Date: Sun, 30 Oct 2016 22:22:05 +0000 (+0000)
Subject: Merge branch 'martin-t/damagetext' into 'master'
X-Git-Tag: xonotic-v0.8.2~468
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6dfc132da81c8ac34d35c4331d409f451b2f809d;p=xonotic%2Fxonotic-data.pk3dir.git

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

Add forgotten cvar to default config

See merge request !384
---

6dfc132da81c8ac34d35c4331d409f451b2f809d