From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:35:30 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/WaypointIcons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f53ede36a1898c157e840c96ffac2534ab3c8e31;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/WaypointIcons
---

f53ede36a1898c157e840c96ffac2534ab3c8e31