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

Merge commit 'origin/1.2'

Conflicts:
	src/plugins/debugger/breakwindow.cpp
parents 7d1bf1fe 992a178b
No related branches found
No related tags found
No related merge requests found
Showing
with 110 additions and 59 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment