diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-12 14:25:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-12 15:09:56 +0200 |
| commit | 4477c49291213354a22e998db0572d9d71b4e65c (patch) | |
| tree | 2b62ebec84d5a1496686118bbf888e01635abb1a /LICENSE.PREVIEW.COMMERCIAL | |
| parent | 33feec0dc8000d1c02d65bddea29c00e89904c65 (diff) | |
| parent | f1de674fd9c1d2007982b139c0ade2052efd126a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh
Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
Diffstat (limited to 'LICENSE.PREVIEW.COMMERCIAL')
0 files changed, 0 insertions, 0 deletions