Files
qt-creator/src/plugins/help
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
..
2016-03-31 10:39:45 +00:00
2016-06-30 12:12:00 +00:00
2016-08-12 13:29:58 +00:00
2015-11-25 14:09:37 +00:00
2016-03-31 10:39:45 +00:00
2016-07-21 08:56:37 +00:00
2016-06-30 12:12:00 +00:00
2016-08-05 10:52:53 +00:00
2016-06-30 12:12:00 +00:00
2016-06-30 12:12:00 +00:00
2016-06-30 12:12:00 +00:00
2015-06-12 09:49:58 +00:00
2016-08-05 10:52:53 +00:00
2016-06-30 12:12:00 +00:00