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

Merge remote-tracking branch 'origin/2.6' 

Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
parents d2bf853c ed86a7ca
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1203 additions and 221 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