installer-framework/installer-framework.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/2.0' into 3.0	Katja Marttila	2017-08-21	1	-0/+7
\| \| \| \| \| \| \| \|	Conflicts: src/libs/installer/downloadfiletask.cpp src/sdk/translations/ru.ts Change-Id: Ibce8b9592c98cec5af3521f4ae6f850c2b8f45ac
*	Merge remote-tracking branch 'origin/2.0'	Katja Marttila	2017-01-30	1	-16/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/installer/lib7z_create.h src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h src/libs/kdtools/localpackagehub.cpp src/libs/kdtools/localpackagehub.h src/libs/kdtools/updatefinder.cpp src/libs/kdtools/updatefinder.h tools/binarycreator/resources/mkdmg.sh Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
*	Merge remote-tracking branch 'origin/2.0'	Iikka Eklund	2016-01-20	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: installerfw.pri src/libs/kdtools/kdgenericfactory.cpp src/libs/kdtools/kdgenericfactory.h src/libs/kdtools/kdupdaterapplication.cpp src/libs/kdtools/kdupdaterapplication.h src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp src/libs/kdtools/kdupdaterupdatesourcesinfo.h sync.profile Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
*	Adjust include guards.	Karsten Heimrich	2015-07-14	1	-3/+3
\| \| \| \| \|	Change-Id: I0252c934b3bcdca254ae6915904d84d5cf013f5a Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
*	Rename files. Remove {kd} prefix. Remove {kdupdater} prefix.	Karsten Heimrich	2015-07-14	1	-0/+131
	Change-Id: I88c93cab718f4659296d5f7f562beefd747a366f Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>