diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-12-09 12:42:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-12-09 12:42:01 +0100 |
| commit | c175f1e62f8eb37e43a30e87ae9e693ef56dabac (patch) | |
| tree | c35ee7e45ffbe3d56f76e0b2be91ee53676d0881 /src/shared | |
| parent | 77b8198c2b1eadcd3f3a6bb9d97275d0f2d05a14 (diff) | |
| parent | 5071dd80cb352ebfe67209e3f3bc70ef619a5ccf (diff) | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/ios/iosdevice.cpp
src/plugins/ios/iossimulator.cpp
src/plugins/projectexplorer/projectwindow.cpp
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
src/shared/qbs
Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 0971e0b7453439f01c72551870d8a2a14075859 +Subproject 64e336b7af5b863de7e8108448f910370678671 |