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-01-19 16:01:06 +00:00
2016-01-19 16:01:06 +00:00
2016-01-19 16:01:06 +00:00
2016-07-20 11:11:29 +00:00
2016-05-26 13:06:15 +00:00
2016-05-26 05:08:23 +00:00
2016-07-13 12:11:11 +00:00
2016-07-13 12:11:11 +00:00
2016-09-05 05:30:33 +00:00
2016-07-01 10:06:22 +00:00
2016-07-22 15:18:00 +03:00
2016-08-30 09:41:46 +00:00
2011-08-26 09:46:31 +02:00
2015-09-01 09:44:28 +00:00