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

Merge branch 'master' into Mario/morphed_explosivesmodel
---

77ffd30cbf1e94a546f70026e69e56e8d777ba83