From: Mirio <opivy@hotmail.de>
Date: Mon, 2 Oct 2017 19:26:41 +0000 (+0000)
Subject: Merge branch 'Spike29/implosion_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.5~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=467b2f00681c5fe71aa1a836778b1d49970ccf61;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Spike29/implosion_fixes' into 'master'

Small tweaks on Implosion

Closes #143, #141, #142, and #145

See merge request xonotic/xonotic-maps.pk3dir!107
---

467b2f00681c5fe71aa1a836778b1d49970ccf61