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

..

echoserver

Merge remote-tracking branch 'origin/4.0'

2016-04-20 14:58:48 +02:00

mockup

Clang: Adjust mockup code to creator code.

2016-06-21 13:37:42 +00:00

unittest

Merge remote-tracking branch 'origin/4.0' into 4.1

2016-06-22 11:09:32 +02:00

unit.pro

Clang: Rename CodeModelBackEnd in ClangBackEnd

2015-06-16 13:29:27 +00:00