• Oswald Buddenhagen's avatar
    Merge remote-tracking branch 'origin/2.6' · 1fda2111
    Oswald Buddenhagen authored
    Conflicts:
    	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
    	src/plugins/debugger/qtmessageloghandler.cpp
    	src/plugins/debugger/qtmessagelogwindow.cpp
    	src/plugins/madde/maemodeployconfigurationwidget.cpp
    	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
    	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
    	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
    	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
    	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
    	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
    	src/plugins/qnx/bardescriptormagicmatcher.h
    	src/plugins/qt4projectmanager/profilekeywords.cpp
    	src/plugins/remotelinux/deployablefilesperprofile.cpp
    	src/plugins/remotelinux/deployablefilesperprofile.h
    	src/plugins/remotelinux/deploymentinfo.cpp
    	src/plugins/remotelinux/deploymentsettingsassistant.cpp
    	src/plugins/remotelinux/profilesupdatedialog.cpp
    	tests/auto/icheckbuild/ichecklib.cpp
    	tests/auto/icheckbuild/parsemanager.cpp
    	tests/auto/icheckbuild/parsemanager.h
    
    Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
    1fda2111
Name
Last commit
Last update
..
qtcreator/externaltools Loading commit data...
README Loading commit data...