Files
qt5/coin/provisioning
Liang Qi 9bfa486dd0 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
2018-10-07 12:49:55 +02:00
..