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

Merge remote branch 'origin/1.3' 

Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
parents f289da3d ea210195
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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