diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-06-22 11:09:32 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-06-22 11:09:32 +0200 |
| commit | 4f9016e03f3d9a6aa1ed3fc4e699230c8ea8639f (patch) | |
| tree | 1781d8785ddc61ee90b84ed1d3e953d5b03f76ae /src/shared/clang | |
| parent | 7a037841a4440ef3a4bd3067cdbd4e9a619e379c (diff) | |
| parent | 3f11ef92167ba4622a5326eb7ef1fc67b61866eb (diff) | |
| download | qt-creator-4f9016e03f3d9a6aa1ed3fc4e699230c8ea8639f.tar.gz | |
Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/android.qbs
src/plugins/android/androiddevice.cpp
src/plugins/autotest/testcodeparser.cpp
src/plugins/debugger/analyzer/analyzerstartparameters.h
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
src/plugins/projectexplorer/devicesupport/idevice.cpp
src/plugins/projectexplorer/runconfiguration.h
Change-Id: I2474d06f2309fa71210a8401846bc2ef85bebf1d
Diffstat (limited to 'src/shared/clang')
0 files changed, 0 insertions, 0 deletions