From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 28 Oct 2017 22:24:33 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/uncrustify
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=077b7a0d5f4a3912050ee365d12e6a9fae8f74aa;p=xonotic%2Fxonotic-data.pk3dir.git

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

077b7a0d5f4a3912050ee365d12e6a9fae8f74aa