Liang Qi ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake ...

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

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16

2019-05-03 10:10:23 +02:00

..

linux

Merge remote-tracking branch 'origin/dev' into wip/cmake

2019-05-03 10:10:23 +02:00

macos

Merge remote-tracking branch 'origin/5.12' into 5.13

2019-04-13 11:38:39 +02:00

shared

Split docker provisioning files

2019-03-15 12:14:20 +00:00

unix

Merge remote-tracking branch 'origin/dev' into wip/cmake

2019-05-03 10:10:23 +02:00

windows

Provisioning: disable docker test servers on Windows 10 (x86_64)

2019-04-16 08:57:44 +00:00