Eike Ziller 02a39c013f Merge remote-tracking branch 'origin/4.1' into 4.2 ...

Conflicts:
	src/plugins/ios/iostoolhandler.cpp
	src/shared/qbs
	src/tools/3rdparty/iossim/iossim.qbs
	src/tools/3rdparty/iossim_1_8_2/main.mm

Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054

2016-10-17 16:16:07 +02:00

16 KiB

Raw Blame History

View Raw