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

Merge commit 'origin/1.1' 

Conflicts:
	src/plugins/debugger/debuggeractions.cpp
	src/plugins/debugger/gdboptionpage.ui
parents 2a1c503b 6f85959d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 461 additions and 116 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