Redkit / QtIFW / 546b7d16d01

Commits

Tim Jenssen committed 546b7d16d01M03 апр 2013

Merge remote-tracking branch 'origin/1.3'

Conflicts:
	installerfw.pri
	src/libs/installer/settings.cpp
	tests/auto/installer/settings/tst_settings.cpp

Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49

Showing diff tof6d6b61f014