From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 10 Nov 2018 14:35:41 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/globals
X-Git-Tag: xonotic-v0.8.5~1258^2~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d219ac051d67eae4559bbc7f0902fe2e0ea539ae;p=xonotic%2Fxonotic-data.pk3dir.git

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

d219ac051d67eae4559bbc7f0902fe2e0ea539ae