Eike Ziller 504a525b35 Merge remote-tracking branch 'origin/4.1' into 4.2 ...

Conflicts:
	scripts/deployqtHelper_mac.sh
	src/plugins/ios/iostoolhandler.cpp

Change-Id: I06219e1c137e8f58f295da423363360457fa0b11

2016-10-24 08:31:00 +02:00

6.4 KiB

Executable File

Raw Blame History

View Raw