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

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10

2018-01-12 21:13:56 +01:00

..

linux

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

2018-01-12 21:13:56 +01:00

macos

Split Common folder based on operating system families

2018-01-10 07:58:26 +00:00

unix

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

2018-01-11 15:13:13 +01:00

windows

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

2018-01-12 21:13:56 +01:00

network_test_server_ip.txt

Make CI use a new win 8.1 provisioning instead of win 8

2017-08-11 16:49:10 +00:00

open62541.sh

Fix open62541 provisioning on Linux

2018-01-03 08:33:13 +00:00

sw_versions.txt

Provision libclang

2017-07-08 07:23:09 +00:00

win10-enable-devmode.ps1

Windows 10: Enable developer mode

2018-01-05 05:37:08 +00:00