From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 28 Jul 2019 00:59:01 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/globals
X-Git-Tag: xonotic-v0.8.5~1258^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3331142a41bd023ef15ced5210a2e1a2206bbb3c;p=xonotic%2Fxonotic-data.pk3dir.git

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

3331142a41bd023ef15ced5210a2e1a2206bbb3c