From: Yannick Le Guen <leguen.yannick@gmail.com>
Date: Tue, 3 Oct 2017 16:33:15 +0000 (+0200)
Subject: Merge branch 'master' into Spike29/tutorial_visuals
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af59ce9274fc9e914c068ec1f270bfb5d41bb753;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Spike29/tutorial_visuals
---

af59ce9274fc9e914c068ec1f270bfb5d41bb753