From: Mario <mario@smbclan.net>
Date: Wed, 22 Aug 2018 08:11:32 +0000 (+1000)
Subject: Merge branch 'Mario/morphed_explosivesmodel'
X-Git-Tag: xonotic-v0.8.5~1921
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72eb0b742297411fd47460d220631cd7e46465a8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/morphed_explosivesmodel'
---

72eb0b742297411fd47460d220631cd7e46465a8