From: Mario <zacjardine@y7mail.com>
Date: Tue, 21 Feb 2017 10:18:13 +0000 (+0000)
Subject: Merge branch 'Mario/weapon_animation_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~189
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ac243b6afb0ad56c6130ba5436d88ce4647bc32;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapon_animation_fix' into 'master'

Merge branch Mario/weapon_animation_fix (XS merge request)

See merge request !411
---

8ac243b6afb0ad56c6130ba5436d88ce4647bc32