Skip to content
Snippets Groups Projects
  • dt's avatar
    c9c5fe15
    Merge remote branch 'origin/2.1' · c9c5fe15
    dt authored
    Conflicts:
    	share/qtcreator/static.pro
    	src/plugins/qmljseditor/qmljshoverhandler.cpp
    	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
    c9c5fe15
    History
    Merge remote branch 'origin/2.1'
    dt authored
    Conflicts:
    	share/qtcreator/static.pro
    	src/plugins/qmljseditor/qmljshoverhandler.cpp
    	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp