Liang Qi
54c94ae681
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
..
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-04-30 18:35:08 +02:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00
2020-03-09 10:50:38 +00:00