From: Mario <zacjardine@y7mail.com>
Date: Fri, 26 Feb 2016 17:35:14 +0000 (+0000)
Subject: Merge branch 'mirceakitsune/shotgun_cannon' into 'master'
X-Git-Tag: xonotic-v0.8.2~10
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=9bc7534870d66d65c3a7a7388c8ba5dbc53fde23

Merge branch 'mirceakitsune/shotgun_cannon' into 'master'

Merge branch mirceakitsune/shotgun_cannon (M merge request)

The original model was merged with a colour swap as the Arc weapon model.

See merge request !9
---

9bc7534870d66d65c3a7a7388c8ba5dbc53fde23