Skip to content
  • con's avatar
    Merge remote branch 'origin/2.0' · 7f4cbe23
    con authored
    Conflicts:
    	src/plugins/debugger/moduleshandler.cpp
    	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
    7f4cbe23