From: Mario <mario.mario@y7mail.com>
Date: Tue, 28 Jun 2016 10:44:34 +0000 (+1000)
Subject: Merge branch 'Mario/fireball_merge'
X-Git-Tag: xonotic-v0.8.2~8
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=9b559a2ac4e325badacae37fe878bba6728e1bc9;hp=86409039b02762ee78184e90bc7feebaf728119e

Merge branch 'Mario/fireball_merge'
---

diff --git a/models/weapons/g_weapons/g_fireball.blend b/models/weapons/g_weapons/g_fireball.blend
new file mode 100644
index 0000000..1af842d
Binary files /dev/null and b/models/weapons/g_weapons/g_fireball.blend differ
diff --git a/models/weapons/v_weapons/v_fireball.blend b/models/weapons/v_weapons/v_fireball.blend
new file mode 100644
index 0000000..60b70bd
Binary files /dev/null and b/models/weapons/v_weapons/v_fireball.blend differ