Files
qt-creator/doc/images
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
..
2014-10-09 15:43:28 +02:00
2016-05-02 15:12:16 +00:00
2012-04-11 15:39:21 +02:00
2012-04-11 15:39:21 +02:00
2012-04-11 15:39:21 +02:00
2016-05-02 15:12:16 +00:00
2016-07-26 11:23:50 +00:00