Skip to content
  • con's avatar
    Merge remote branch 'origin/2.1' · 2ca77dfe
    con authored
    Conflicts:
    	src/plugins/debugger/qml/qmlengine.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
    2ca77dfe