From: Mario <mario.mario@y7mail.com>
Date: Mon, 30 Sep 2019 13:34:56 +0000 (+0000)
Subject: Merge branch 'Mario/campaign_mapinfo_fix_v2' into 'master'
X-Git-Tag: xonotic-v0.8.5~1254
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=242da345d0d786969b7ca3d478e89fa1662ab458;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/campaign_mapinfo_fix_v2' into 'master'

Merge branch Mario/campaign_mapinfo_fix_v2 (S merge request)

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

242da345d0d786969b7ca3d478e89fa1662ab458