diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-31 09:52:16 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-31 11:25:26 +0200 |
| commit | 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb (patch) | |
| tree | da0ede7139bd865d53939cd41f083cdb5461f879 /coin/platform_configs/qtdeclarative.txt | |
| parent | 21ecbe19578a700b90dbf99e83388e374d81052f (diff) | |
| parent | a99d3432f71c4be5045ae2cdcc3b7070de5abe23 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
Diffstat (limited to 'coin/platform_configs/qtdeclarative.txt')
0 files changed, 0 insertions, 0 deletions