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

Merge commit 'bd8b23d4' (origin/2.1) 

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
parents 1b6d9966 bd8b23d4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 100 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