From: terencehill <piuntn@gmail.com>
Date: Tue, 17 Aug 2021 15:32:59 +0000 (+0000)
Subject: Merge branch 'Mario/superweapon_sound_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~365
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee70432b76c33fb572487a67d96794afc9b21bca;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/superweapon_sound_fix' into 'master'

Merge branch Mario/superweapon_sound_fix (XS merge request)

Closes #2620

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

ee70432b76c33fb572487a67d96794afc9b21bca