Eike Ziller c635c6b50a Merge remote-tracking branch 'origin/4.1' ...

Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c

2016-09-13 12:15:09 +02:00

..

dark.creatortheme

Merge remote-tracking branch 'origin/4.1'

2016-09-13 12:15:09 +02:00

default.creatortheme

Timeline: Add some theming

2016-08-05 11:35:35 +00:00

flat-dark.creatortheme

Merge remote-tracking branch 'origin/4.1'

2016-09-13 12:15:09 +02:00

flat-light.creatortheme

Timeline: Add some theming

2016-08-05 11:35:35 +00:00

flat.creatortheme

Timeline: Add some theming

2016-08-05 11:35:35 +00:00