Eike Ziller c175f1e62f Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2

2016-12-09 12:42:01 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/4.2'

2016-12-09 12:42:01 +01:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Fix qbs build on macOS

2016-07-28 14:45:12 +00:00