From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Jul 2018 12:23:59 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/WaypointIcons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1bc702dfdee634f6d04d1fd231e4ee9e4da4da62;p=xonotic%2Fxonotic-data.pk3dir.git

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

1bc702dfdee634f6d04d1fd231e4ee9e4da4da62