Eike Ziller
4f9016e03f
Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/android.qbs
src/plugins/android/androiddevice.cpp
src/plugins/autotest/testcodeparser.cpp
src/plugins/debugger/analyzer/analyzerstartparameters.h
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
src/plugins/projectexplorer/devicesupport/idevice.cpp
src/plugins/projectexplorer/runconfiguration.h
Change-Id: I2474d06f2309fa71210a8401846bc2ef85bebf1d
2016-06-22 11:09:32 +02:00
..
2016-05-09 16:37:41 +02:00
2016-01-19 16:01:06 +00:00
2016-01-19 16:01:06 +00:00
2016-02-17 10:35:34 +00:00
2016-01-19 16:01:06 +00:00
2016-03-30 15:20:19 +00:00
2015-07-23 11:48:32 +00:00
2016-01-19 16:01:06 +00:00
2016-04-20 13:03:32 +00:00
2016-02-25 13:31:15 +00:00
2016-01-19 16:01:06 +00:00
2016-03-07 12:07:21 +00:00
2016-02-16 18:27:44 +00:00
2016-01-19 16:01:06 +00:00
2016-02-08 14:11:44 +00:00
2016-06-21 13:37:35 +00:00
2016-02-01 12:20:53 +00:00
2016-05-03 12:19:13 +00:00
2016-01-19 16:01:06 +00:00
2015-07-23 11:48:32 +00:00
2016-01-19 16:01:06 +00:00
2015-09-28 15:46:15 +00:00
2016-01-19 16:01:06 +00:00
2016-02-12 11:54:09 +00:00
2016-02-12 11:54:09 +00:00
2016-01-19 16:01:06 +00:00
2016-04-18 11:14:06 +00:00
2016-03-30 15:20:19 +00:00
2016-03-07 12:06:40 +00:00
2016-03-07 14:07:07 +00:00
2016-01-19 16:01:06 +00:00
2016-02-17 10:35:34 +00:00
2016-01-19 16:01:06 +00:00
2016-03-30 15:20:19 +00:00
2016-03-30 15:20:19 +00:00
2016-03-30 15:20:19 +00:00
2016-01-19 16:01:06 +00:00
2016-02-08 14:11:44 +00:00
2016-01-19 16:01:06 +00:00
2016-02-22 14:53:12 +00:00
2016-01-19 16:01:06 +00:00
2016-02-22 07:22:36 +00:00
2016-03-08 11:50:30 +00: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-03-30 15:20:19 +00: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-01-19 16:01:06 +00:00
2016-01-19 16:01:06 +00:00
2016-01-19 16:01:06 +00:00
2016-05-03 11:49:01 +02:00
2016-05-03 11:49:01 +02:00
2016-06-08 14:16:57 +00:00
2016-02-01 12:20:53 +00:00
2016-05-03 12:19:13 +00:00
2016-05-03 12:19:13 +00:00
2016-01-19 16:01:06 +00:00