From: terencehill <piuntn@gmail.com>
Date: Sun, 18 Sep 2022 20:24:20 +0000 (+0000)
Subject: Merge branch 'terencehill/shotgun_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.6~357
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7843be921827ab962ad34eb33470a0d91a4bb28f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/shotgun_fixes' into 'master'

Fix some shotgun bugs

Closes #2728

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

7843be921827ab962ad34eb33470a0d91a4bb28f