Skip to content
Snippets Groups Projects
  • con's avatar
    441ece36
    Merge commit 'origin/1.3' · 441ece36
    con authored
    Conflicts:
    	src/plugins/cpptools/cppcodecompletion.h
    	src/plugins/debugger/gdb/gdbengine.cpp
    	src/plugins/qmleditor/QmlEditor.pluginspec
    441ece36
    History
    Merge commit 'origin/1.3'
    con authored
    Conflicts:
    	src/plugins/cpptools/cppcodecompletion.h
    	src/plugins/debugger/gdb/gdbengine.cpp
    	src/plugins/qmleditor/QmlEditor.pluginspec