Merge branch 'Spike29/fuse' into 'master'
authorMirio <opivy@hotmail.de>
Wed, 8 Dec 2021 14:07:31 +0000 (14:07 +0000)
committerMirio <opivy@hotmail.de>
Wed, 8 Dec 2021 14:07:31 +0000 (14:07 +0000)
commit33c2177eda1d468ac574f264317bf5b0f2f3f034
treefd83b05bbfc19be0177a160d328cdaa336ff6d2d
parent795e41d01a45a3942c461fdfe43f05f8cb5b8511
parent4a30459806a4a10efea805bf3650ce7d566e3a5c
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