Liang Qi 1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev ...

Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47

2017-10-05 12:47:24 +02:00

..

default.txt

Merge remote-tracking branch 'origin/5.9' into 5.10

2017-09-27 10:26:38 +02:00

qt5.txt

Merge remote-tracking branch 'origin/5.10' into dev

2017-10-05 12:47:24 +02:00

qtdeclarative.txt

Merge remote-tracking branch 'origin/5.9' into 5.10

2017-09-06 10:19:35 +02:00

qtwebkit.txt

Use 64-bit host for VS2017 builds of QtWebKit

2017-09-05 13:46:17 +00:00