Skip to content
Snippets Groups Projects
Commit 7545ce07 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.7' 

Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
parents 04f2533c fde3803c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 348 additions and 148 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