From: Mario <zacjardine@y7mail.com>
Date: Mon, 25 Jun 2018 03:16:21 +0000 (+0000)
Subject: Merge branch 'Mario/morphed_explosivesmodel' into 'master'
X-Git-Tag: xonotic-v0.8.5~1984
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=a8e11f490f08342fc48c332412c8fc6e23f3d171

Merge branch 'Mario/morphed_explosivesmodel' into 'master'

Merge branch Mario/morphed_explosivesmodel (XS merge request)

Closes #2045

See merge request xonotic/xonotic-data.pk3dir!572
---

a8e11f490f08342fc48c332412c8fc6e23f3d171