From: Mario <zacjardine@y7mail.com>
Date: Sun, 11 Aug 2019 10:34:55 +0000 (+0000)
Subject: Merge branch 'martin-t/whoosh' into 'master'
X-Git-Tag: xonotic-v0.8.5~1406
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97ead695d25a6f24ee9d9837664e05456692af9d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/whoosh' into 'master'

Fixes for nex whoosh

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

97ead695d25a6f24ee9d9837664e05456692af9d