Merge branch 'martin-t/fix1994' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 4 Nov 2018 17:13:55 +0000 (17:13 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 4 Nov 2018 17:13:55 +0000 (17:13 +0000)
commit3d9eb7757e3157dee0f0988feb37864a226fff81
treef2d5d616ff591cf8479965f79775fb4948626969
parentfd9e890d469def3ac36773cb084af4e5358ff0b0
parentb2e9de184227b0f37a03cfd18accec576f904625
Merge branch 'martin-t/fix1994' into 'master'

Fix #1994 in a better way

Closes #1994

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