From: Martin Taibr <taibr.martin@gmail.com>
Date: Thu, 29 Aug 2019 23:48:17 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/mg-solidpen
X-Git-Tag: xonotic-v0.8.5~1307^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af43b181a15f348a4de2045b716ebc7765ce8f9f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/mg-solidpen
---

af43b181a15f348a4de2045b716ebc7765ce8f9f