From: Mirio <opivy@hotmail.de>
Date: Fri, 13 Nov 2015 18:29:58 +0000 (+0100)
Subject: Merge branch 'sev/hud_teamkill_icons'
X-Git-Tag: xonotic-v0.8.2~1667
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=24d1c976511df6e2e85b9abff21235ddea04f424;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'sev/hud_teamkill_icons'
---

24d1c976511df6e2e85b9abff21235ddea04f424