Merge branch 'master' into Mario/campaign_mapinfo_fix_v2 674/head
authorterencehill <piuntn@gmail.com>
Sun, 29 Sep 2019 13:43:31 +0000 (15:43 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 29 Sep 2019 13:43:31 +0000 (15:43 +0200)
commit0d0a2025de767dbfae0519941294f5947fe38c1f
tree74e4f026047a769198f7a2a949cba4e1f6280f5f
parentdf0725fcacd8658029c3d9556a213ddb5d0ded62
parent16225fa152cd4b9bd9d663b9538989bd3f789999
Merge branch 'master' into Mario/campaign_mapinfo_fix_v2
qcsrc/common/mapinfo.qh