Skip to content
Snippets Groups Projects
  • con's avatar
    001e759b
    Merge remote branch 'origin/2.0' · 001e759b
    con authored
    Conflicts:
    	src/plugins/debugger/cdb/cdbdebugengine.cpp
    	src/plugins/debugger/cdb/cdbdumperhelper.cpp
    	src/plugins/debugger/gdb/gdbengine.cpp
    001e759b
    History
    Merge remote branch 'origin/2.0'
    con authored
    Conflicts:
    	src/plugins/debugger/cdb/cdbdebugengine.cpp
    	src/plugins/debugger/cdb/cdbdumperhelper.cpp
    	src/plugins/debugger/gdb/gdbengine.cpp