Skip to content
  • con's avatar
    Merge remote branch 'origin/2.1' · 519b544f
    con authored
    Conflicts:
    	doc/qtcreator.qdoc
    	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
    	src/plugins/qt4projectmanager/qmakestep.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
    	src/plugins/qt4projectmanager/qtversionmanager.cpp
    519b544f