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

Merge remote-tracking branch 'origin/2.7' into 2.8 

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
parents 116db445 4ae9f377
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 22 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