Merge branch 'Mario/campaign_mapinfo_fix_v2' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:34:56 +0000 (13:34 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 13:34:56 +0000 (13:34 +0000)
commit242da345d0d786969b7ca3d478e89fa1662ab458
tree74e4f026047a769198f7a2a949cba4e1f6280f5f
parent16225fa152cd4b9bd9d663b9538989bd3f789999
parent0d0a2025de767dbfae0519941294f5947fe38c1f
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