From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 17 Aug 2019 18:30:52 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/globals
X-Git-Tag: xonotic-v0.8.5~1258^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e69041898af22d651b6416745431cbaab84b0d5;p=xonotic%2Fxonotic-data.pk3dir.git

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

8e69041898af22d651b6416745431cbaab84b0d5