]> 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: 32fbad1 56a76f2)
Merge branch 'Mario/superweapon_sound_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Tue, 17 Aug 2021 15:32:59 +0000 (15:32 +0000)
committerterencehill <piuntn@gmail.com>
Tue, 17 Aug 2021 15:32:59 +0000 (15:32 +0000)
Merge branch Mario/superweapon_sound_fix (XS merge request)

Closes #2620

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


Trivial merge