From: LegendaryGuard <rootuser999@gmail.com>
Date: Thu, 5 Jan 2023 00:20:57 +0000 (+0000)
Subject: Merge branch 'terencehill/weapon_decals_fix' into 'master'
X-Git-Tag: xonotic-v0.8.6~226
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99c3e6da047827e29ecd320cc39215ae3a951637;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/weapon_decals_fix' into 'master'

Fix #2777 and a related issue (about decals)

Closes #2777

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

99c3e6da047827e29ecd320cc39215ae3a951637