Diffusion digiKam d07912bab310

Merge branch 'master' of invent.kde.org:kde/digikam
d07912bab310
Actions

Authored by cgilles on Jul 12 2019, 3:33 AM.

Description

Merge branch 'master' of invent.kde.org:kde/digikam

Details

Committed

cgilles

Jul 12 2019, 3:33 AM

Parents

R482:77e22672b2b1: Internal Libraw updated to last stable 0.19.3. New camera supported: Canon A560…
R482:a7c922ea0bfa: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

cgilles committed R482:d07912bab310: Merge branch 'master' of invent.kde.org:kde/digikam (authored by cgilles).Jul 12 2019, 3:33 AM

Merged Changes

	Commit			Author	Details	Committed
	a7c922ea0bfa			l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Jul 12 2019

Changes (26)

				Path	Packages
	M			core/dplugins/generic/tools/htmlgallery/themes/vanilla/vanilla.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_10.5x14.8cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_20x25cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_8x10.desktop
	M			core/dplugins/generic/tools/printcreator/templates/1_photo_9x13cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/2_photos_13x18cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/2_photos_5x7.desktop
	M			core/dplugins/generic/tools/printcreator/templates/3_photos_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/3_photos_4x6.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_10x13.33cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_3.5x5.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_4.5x5cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4_photos_9x13cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/4x6Album.desktop
	M			core/dplugins/generic/tools/printcreator/templates/6_photos_3.5x4.5cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/6_photos_3.5x4cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/8_photos_6x9cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album-Collage.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album-Collage1.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album_10x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Album_11.5x15cm.desktop
	M			core/dplugins/generic/tools/printcreator/templates/FullPage.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Photoframe.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Thumbnails_5x4.desktop
	M			core/dplugins/generic/tools/printcreator/templates/Thumbnails_6x5.desktop