From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 3 Aug 2018 17:18:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/divVerent/fullbright'
X-Git-Tag: xonotic-v0.8.5~1940
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2bddfb42fdbb3318aa319d228d8c99adcc90b128;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/divVerent/fullbright'
---

2bddfb42fdbb3318aa319d228d8c99adcc90b128