From: Mario <mario@smbclan.net>
Date: Sun, 11 Feb 2018 00:45:20 +0000 (+1000)
Subject: Merge branch 'DefaultUser/waypoint_icons'
X-Git-Tag: xonotic-v0.8.5~2328
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd23509188e500cf08c6c33b8e37d4faeae6f1d3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'DefaultUser/waypoint_icons'
---

dd23509188e500cf08c6c33b8e37d4faeae6f1d3