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)
1  2 
qcsrc/common/mapinfo.qh

Simple merge