From: Mirio <opivy@hotmail.de>
Date: Sat, 11 Mar 2017 20:13:43 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/catharsis_opt' into 'master'
X-Git-Tag: xonotic-v0.8.2~74^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ef5671de723cb8da45238da44d840b863d3ac09e;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/catharsis_opt' into 'master'

catharsis: correct syntax of map options file.

See merge request !70
---

ef5671de723cb8da45238da44d840b863d3ac09e