Liang Qi c1c44574f6 Merge remote-tracking branch 'origin/5.15.0' into 5.15 ...

Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
	coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
	coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1

Change-Id: Ic7ed52251573824595821c53025323287d60b536

2020-05-28 10:22:03 +02:00

2.1 KiB

Executable File

Raw Blame History

View Raw