From: Mario <zacjardine@y7mail.com>
Date: Wed, 11 Jul 2018 03:39:14 +0000 (+0000)
Subject: Merge branch 'sev/lumaIcons' into 'master'
X-Git-Tag: xonotic-v0.8.5~1956
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5453f53da1df88742c11c71e4dc5b9c3e3d24c62;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/lumaIcons' into 'master'

Add new HUD icons for overkill and assault

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

5453f53da1df88742c11c71e4dc5b9c3e3d24c62