-
Eike Ziller authored
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
4f9016e0