Skip to content
Snippets Groups Projects
Commit 3fcb20d6 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

Merge branch '1.0.0' into master-master 

Conflicts:
	src/plugins/debugger/debugger.pro
	src/plugins/debugger/gdbengine.cpp
parents cf66237c 7ec95338
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 73 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