Skip to content
  • con's avatar
    Merge remote branch 'origin/2.0' · af44136e
    con authored
    Conflicts:
    	doc/qtcreator.qdoc
    	src/plugins/help/helpplugin.cpp
    	src/plugins/projectexplorer/projectexplorer.cpp
    	src/plugins/projectexplorer/projectexplorer.h
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
    	src/tools/qml/qmldump/main.cpp
    af44136e