Merge branch 'martin-t/whoosh' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 10:34:55 +0000 (10:34 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 10:34:55 +0000 (10:34 +0000)
commit97ead695d25a6f24ee9d9837664e05456692af9d
tree8f024ca8aa0053c1deefc75497afc6fb3b628637
parentbb7483c63ebea9f18e4233a0fa5974d300a3bfb0
parent17659a0446f9789974a93b5544f7bf85317c8363
Merge branch 'martin-t/whoosh' into 'master'

Fixes for nex whoosh

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