From: Mario <mario@smbclan.net>
Date: Wed, 7 Feb 2018 09:18:46 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/waypoint_icons
X-Git-Tag: xonotic-v0.8.5~2328^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d6a328a053a17934147baf67fe01c5719bbf7388;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/waypoint_icons
---

d6a328a053a17934147baf67fe01c5719bbf7388