Skip to content
Snippets Groups Projects
Commit 7e739985 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Merge remote branch 'origin/2.0' 

Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
parents 077c9181 9bad0c01
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 279 additions and 4382 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