From: Mario <zacjardine@y7mail.com>
Date: Mon, 11 Jun 2018 02:12:48 +0000 (+0000)
Subject: Merge branch 'Lyberta/OverkillWeaponIcons' into 'master'
X-Git-Tag: xonotic-v0.8.5~2079
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=145f53c7f8335d736736612a28ab636a35513bcf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/OverkillWeaponIcons' into 'master'

Overkill weapon icons code

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

145f53c7f8335d736736612a28ab636a35513bcf