From: Mirio <opivy@hotmail.de>
Date: Wed, 8 Dec 2021 14:07:31 +0000 (+0000)
Subject: Merge branch 'Spike29/fuse' into 'master'
X-Git-Tag: xonotic-v0.8.5~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33c2177eda1d468ac574f264317bf5b0f2f3f034;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Spike29/fuse' into 'master'

Fix a z-fight on the column behind the Big armor, fixes #188

Closes #188

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

33c2177eda1d468ac574f264317bf5b0f2f3f034