Liang Qi f58935ebea Merge remote-tracking branch 'origin/5.12' into 5.13 ...

Conflicts:
	coin/platform_configs/default.yaml
	coin/provisioning/common/linux/disable-ntp_linux.sh
	coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
	coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
		emsdk.sh was moved from linux to unix, see
		38e416be66

Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957

2019-08-28 20:28:11 +02:00

..

linux

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

2019-08-28 20:28:11 +02:00

macos

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

2019-08-04 11:51:40 +02:00

shared

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

2019-08-03 00:02:43 +02:00

unix

Provisioning: Append the emscripten to path instead of prepend

2019-08-12 21:01:55 +00:00

windows

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

2019-08-03 00:02:43 +02:00