Files
qt5/coin/platform_configs/default.yaml
Liang Qi 2d577a83ec Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
2019-10-03 14:40:41 +02:00

14 KiB