From: Mario <zacjardine@y7mail.com>
Date: Tue, 29 Aug 2017 01:41:39 +0000 (+0000)
Subject: Merge branch 'martin-t/dmgtext' into 'master'
X-Git-Tag: xonotic-v0.8.5~2490
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e3827e09272ce54f06b3bd9e170d1444fff19b42

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

Document spectatee_status, disable 2d dmgtext for observers

See merge request !477
---

e3827e09272ce54f06b3bd9e170d1444fff19b42