Skip to content
Snippets Groups Projects
Commit bc89f5dc authored by Thorbjørn Lindeijer's avatar Thorbjørn Lindeijer
Browse files

Merge branch '1.1' 

Conflicts:
	src/plugins/debugger/debuggeractions.cpp

Reviewed-by: hjk
parents 7a0baf65 ef1311d0
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 321 additions and 128 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