• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/4.0' · 0f94aa3f
    Eike Ziller authored
     Conflicts:
    	src/plugins/debugger/debuggerruncontrol.cpp
    	src/plugins/projectexplorer/projectwizardpage.cpp
    	src/plugins/projectexplorer/xcodebuildparser.h
    	src/plugins/qmldesigner/qmldesignerplugin.cpp
    	src/tools/clangbackend/ipcsource/translationunits.cpp
    
    Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
    0f94aa3f
xcodebuildparser.cpp 12.5 KB