From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 25 Jul 2018 17:16:02 +0000 (+0000)
Subject: Merge branch 'Lyberta/AssaultIcons' into 'master'
X-Git-Tag: xonotic-v0.8.5~1948
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64d6ae97e47fc166077e544cd3420429ae025139;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/AssaultIcons' into 'master'

Enabled Assault waypoint icons

See merge request xonotic/xonotic-data.pk3dir!576
---

64d6ae97e47fc166077e544cd3420429ae025139