From: Mario <zacjardine@y7mail.com>
Date: Mon, 10 Aug 2015 17:58:19 +0000 (+0000)
Subject: Merge branch 'Mario/buff_updates' into 'master'
X-Git-Tag: xonotic-v0.8.1~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=129fa209a7798b37270a888523974533c1b4aa87;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/buff_updates' into 'master'

Merge branch Mario/buff_updates (XL merge request)

Includes many changes & fixes to the buffs mutator, along with sev's work on their graphical side (HUD & model icons).

See merge request !162
---

129fa209a7798b37270a888523974533c1b4aa87