From: Mirio <opivy@hotmail.de>
Date: Sat, 16 Jun 2018 10:39:53 +0000 (+0000)
Subject: Merge branch 'vorix-fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~110
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=704f156f1b1b41b1e3f30afb1841f7ac43b4f15b

Merge branch 'vorix-fix' into 'master'

fix error

See merge request xonotic/xonotic-maps.pk3dir!121
---

704f156f1b1b41b1e3f30afb1841f7ac43b4f15b