From: Mario <zacjardine@y7mail.com>
Date: Mon, 25 Jun 2018 03:16:59 +0000 (+0000)
Subject: Merge branch 'Mario/morphed_explosivesmodel' into 'master'
X-Git-Tag: xonotic-v0.8.5~12^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d3c32b84df2b4cc1377bb1076038581b0119541;p=xonotic%2Fmediasource.git

Merge branch 'Mario/morphed_explosivesmodel' into 'master'

Add sources for Morphed's explosives ammo box

See merge request xonotic/mediasource!13
---

5d3c32b84df2b4cc1377bb1076038581b0119541