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

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

24925f683d66aae005ccafad416e534b44e2d5ef