Skip to content
Snippets Groups Projects
Commit 001e759b authored by con's avatar con
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/debugger/cdb/cdbdebugengine.cpp
	src/plugins/debugger/cdb/cdbdumperhelper.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
parents 05ed39bb ed0394d4
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 72 additions and 58 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment