From: Mario <mario.mario@y7mail.com>
Date: Fri, 30 Aug 2019 08:32:49 +0000 (+0000)
Subject: Merge branch 'Mario/tenshihan_newsounds' into 'master'
X-Git-Tag: xonotic-v0.8.5~1345
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7225542c271470021b0006aadce6d7db255ec2af;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/tenshihan_newsounds' into 'master'

Merge branch Mario/tenshihan_newsounds (S merge request)

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

7225542c271470021b0006aadce6d7db255ec2af