From: Yannick Le Guen <leguen.yannick@gmail.com>
Date: Thu, 14 Dec 2017 17:33:13 +0000 (+0100)
Subject: Merge branch 'master' into Spike29/tutorial_visuals
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f4fe3bbc3f1ca5ea50c79581c31b86f7dbdd6fbd;p=xonotic%2Fxonotic-maps.pk3dir.git

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

f4fe3bbc3f1ca5ea50c79581c31b86f7dbdd6fbd