]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e3cca2 ceb39e7)
Merge branch 'terencehill/weapon_decals_fix' into 'master'
authorLegendaryGuard <rootuser999@gmail.com>
Thu, 5 Jan 2023 00:20:57 +0000 (00:20 +0000)
committerLegendaryGuard <rootuser999@gmail.com>
Thu, 5 Jan 2023 00:20:57 +0000 (00:20 +0000)
Fix #2777 and a related issue (about decals)

Closes #2777

See merge request xonotic/xonotic-data.pk3dir!1112


Trivial merge