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
..
2019-09-27 08:43:00 +02:00
2020-01-20 20:04:48 +00:00
2020-04-30 18:35:08 +02:00
2018-11-07 07:23:49 +00:00
2018-08-30 04:53:50 +00:00
2019-01-23 08:02:11 +01:00
2018-11-07 07:23:49 +00:00
2019-01-17 09:45:02 +00:00
2020-02-19 11:01:15 +02:00
2020-01-03 17:33:24 +02:00
2018-08-30 04:53:50 +00:00
2019-04-01 15:16:59 +00:00
2020-03-19 21:52:59 +01:00
2019-06-10 10:07:20 +00:00
2019-04-01 15:16:59 +00:00
2018-08-30 04:53:50 +00:00
2019-01-17 09:45:12 +00:00
2018-08-30 04:53:50 +00:00
2019-06-06 06:58:55 +00:00
2019-06-10 10:07:20 +00:00
2019-04-01 15:16:59 +00:00
2019-04-01 15:16:59 +00:00
2019-04-01 15:16:59 +00:00
2018-08-30 04:53:50 +00:00
2019-04-01 15:16:59 +00:00
2019-04-01 15:16:59 +00:00