Skip to content
  • dt's avatar
    Merge remote branch 'origin/2.1' · 4ac72532
    dt authored
    Conflicts:
    	share/qtcreator/static.pro
    	src/plugins/cppeditor/cppeditor.cpp
    	src/plugins/qmljseditor/qmljseditor.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
    	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
    	src/plugins/qt4projectmanager/qtoutputformatter.cpp
    	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
    4ac72532