• 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
Name
Last commit
Last update
..
images Loading commit data...
Bookmarks.json.in Loading commit data...
bookmark.cpp Loading commit data...
bookmark.h Loading commit data...
bookmarkmanager.cpp Loading commit data...
bookmarkmanager.h Loading commit data...
bookmarks.pro Loading commit data...
bookmarks.qbs Loading commit data...
bookmarks.qrc Loading commit data...
bookmarks_dependencies.pri Loading commit data...
bookmarks_global.h Loading commit data...
bookmarksplugin.cpp Loading commit data...
bookmarksplugin.h Loading commit data...