Skip to content
Snippets Groups Projects
  • con's avatar
    43bccb41
    Merge commit 'origin/1.3' · 43bccb41
    con authored
    Conflicts:
    	src/plugins/debugger/debuggermanager.h
    	src/plugins/qmleditor/qmleditorplugin.cpp
    	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
    43bccb41
    History
    Merge commit 'origin/1.3'
    con authored
    Conflicts:
    	src/plugins/debugger/debuggermanager.h
    	src/plugins/qmleditor/qmleditorplugin.cpp
    	src/plugins/qt4projectmanager/qt4runconfiguration.cpp