]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 795e41d 4a30459)
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)
Fix a z-fight on the column behind the Big armor, fixes #188

Closes #188

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


Trivial merge