Merge branch 'development/dplugins' of git.kde.org:digikam into…
c5f50247787b
Actions

Authored by mqualmann on Jan 20 2019, 10:47 AM.

Description

Merge branch 'development/dplugins' of git.kde.org:digikam into development/dplugins

Details

Committed

Jan 20 2019, 10:47 AM

Parents

R482:8beea5040a8c: Merge branch 'master' into development/dplugins
R482:769f1f69514e: Merge branch 'master' into dplugins

Branches

Unknown

Tags

Unknown

mqualmann committed R482:c5f50247787b: Merge branch 'development/dplugins' of git.kde.org:digikam into… (authored by mqualmann).Jan 20 2019, 10:47 AM

Merged Changes

Commit	Author	Details	Committed
769f1f69514e	cgilles	Merge branch 'master' into dplugins	Jan 20 2019
0ec46aafe00a	cgilles	update	Jan 20 2019
b26046ed04c2	cgilles	polish	Jan 20 2019
a50d64cb0243	cgilles	forget to remove this debug line CCBUGS: 403269	Jan 20 2019
8259cc98043b	cgilles	Merge branch 'master' into dplugins	Jan 19 2019
e17de2d47802	cgilles	use utf8 encoding to list DPlugins authors	Jan 19 2019

Changes (117)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			NEWS
	M			core/dplugins/bqm/colors/autocorrectionplugin.cpp
	M			core/dplugins/bqm/colors/bcgcorrectionplugin.cpp
	M			core/dplugins/bqm/colors/bwconvertplugin.cpp
	M			core/dplugins/bqm/colors/channelmixerplugin.cpp
	M			core/dplugins/bqm/colors/colorbalanceplugin.cpp
	M			core/dplugins/bqm/colors/convert16to8plugin.cpp
	M			core/dplugins/bqm/colors/convert8to16plugin.cpp
	M			core/dplugins/bqm/colors/curvesadjustplugin.cpp
	M			core/dplugins/bqm/colors/hslcorrectionplugin.cpp
	M			core/dplugins/bqm/colors/iccconvertplugin.cpp
	M			core/dplugins/bqm/colors/invertplugin.cpp
	M			core/dplugins/bqm/colors/whitebalanceplugin.cpp
	M			core/dplugins/bqm/convert/converttodngplugin.cpp
	M			core/dplugins/bqm/convert/converttojp2plugin.cpp
	M			core/dplugins/bqm/convert/converttojpegplugin.cpp
	M			core/dplugins/bqm/convert/converttopgfplugin.cpp
	M			core/dplugins/bqm/convert/converttopngplugin.cpp
	M			core/dplugins/bqm/convert/converttotiffplugin.cpp
	M			core/dplugins/bqm/custom/userscriptplugin.cpp
	M			core/dplugins/bqm/decorate/borderplugin.cpp
	M			core/dplugins/bqm/decorate/watermarkplugin.cpp
	M			core/dplugins/bqm/enhance/antivignettingplugin.cpp
	M			core/dplugins/bqm/enhance/lensautofixplugin.cpp
	M			core/dplugins/bqm/enhance/localcontrastplugin.cpp
	M			core/dplugins/bqm/enhance/noisereductionplugin.cpp
	M			core/dplugins/bqm/enhance/redeyecorrectionplugin.cpp
	M			core/dplugins/bqm/enhance/restorationplugin.cpp
	M			core/dplugins/bqm/enhance/sharpenplugin.cpp
	M			core/dplugins/bqm/filters/colorfxplugin.cpp
	M			core/dplugins/bqm/filters/filmgrainplugin.cpp
	M			core/dplugins/bqm/metadata/assigntemplateplugin.cpp
	M			core/dplugins/bqm/metadata/removemetadataplugin.cpp
	M			core/dplugins/bqm/metadata/timeadjustplugin.cpp
	M			core/dplugins/bqm/transform/cropplugin.cpp
	M			core/dplugins/bqm/transform/flipplugin.cpp
	M			core/dplugins/bqm/transform/resizeplugin.cpp
	M			core/dplugins/bqm/transform/rotateplugin.cpp
	M			core/dplugins/editor/colors/adjustcurvestoolplugin.cpp
	M			core/dplugins/editor/colors/adjustlevelstoolplugin.cpp
	M			core/dplugins/editor/colors/autocorrectiontoolplugin.cpp
	M			core/dplugins/editor/colors/bcgtoolplugin.cpp
	M			core/dplugins/editor/colors/bwsepiatoolplugin.cpp
	M			core/dplugins/editor/colors/cbtoolplugin.cpp
	M			core/dplugins/editor/colors/channelmixertoolplugin.cpp
	M			core/dplugins/editor/colors/convert16to8toolplugin.cpp
	M			core/dplugins/editor/colors/convert8to16toolplugin.cpp
	M			core/dplugins/editor/colors/filmtoolplugin.cpp
	M			core/dplugins/editor/colors/hsltoolplugin.cpp
	M			core/dplugins/editor/colors/inverttoolplugin.cpp
	M			core/dplugins/editor/colors/profileconversiontoolplugin.cpp
	M			core/dplugins/editor/colors/whitebalancetoolplugin.cpp
	M			core/dplugins/editor/decorate/bordertoolplugin.cpp
	M			core/dplugins/editor/decorate/inserttexttoolplugin.cpp
	M			core/dplugins/editor/decorate/texturetoolplugin.cpp
	M			core/dplugins/editor/enhance/antivignettingtoolplugin.cpp
	M			core/dplugins/editor/enhance/blurtoolplugin.cpp
	M			core/dplugins/editor/enhance/healingclone/healingclonetoolplugin.cpp
	M			core/dplugins/editor/enhance/hotpixels/hotpixelstoolplugin.cpp
	M			core/dplugins/editor/enhance/lensautofixtoolplugin.cpp
	M			core/dplugins/editor/enhance/lensdistortiontoolplugin.cpp
	M			core/dplugins/editor/enhance/localcontrasttoolplugin.cpp
	M			core/dplugins/editor/enhance/noisereductiontoolplugin.cpp
	M			core/dplugins/editor/enhance/redeyetoolplugin.cpp
	M			core/dplugins/editor/enhance/restorationtoolplugin.cpp
	M			core/dplugins/editor/enhance/sharpentoolplugin.cpp
	M			core/dplugins/editor/file/print/printplugin.cpp
	M			core/dplugins/editor/filters/blurfxtoolplugin.cpp
	M			core/dplugins/editor/filters/charcoaltoolplugin.cpp
	M			core/dplugins/editor/filters/colorfxtoolplugin.cpp
	M			core/dplugins/editor/filters/distortionfxtoolplugin.cpp
	M			core/dplugins/editor/filters/embosstoolplugin.cpp
	M			core/dplugins/editor/filters/filmgraintoolplugin.cpp
	M			core/dplugins/editor/filters/oilpainttoolplugin.cpp
	M			core/dplugins/editor/filters/raindroptoolplugin.cpp
	M			core/dplugins/editor/transform/autocroptoolplugin.cpp
	M			core/dplugins/editor/transform/contentawareresizetoolplugin.cpp
	M			core/dplugins/editor/transform/freerotationtoolplugin.cpp
	M			core/dplugins/editor/transform/perspective/perspectivetoolplugin.cpp
	M			core/dplugins/editor/transform/ratiocrop/ratiocroptoolplugin.cpp
	M			core/dplugins/editor/transform/resizetoolplugin.cpp
	M			core/dplugins/editor/transform/sheartoolplugin.cpp
	M			core/dplugins/generic/import/dscanner/dscannerplugin.cpp
	M			core/dplugins/generic/metadata/geolocationedit/geolocationeditplugin.cpp
	M			core/dplugins/generic/metadata/metadataedit/metadataeditplugin.cpp
	M			core/dplugins/generic/metadata/timeadjust/timeadjustplugin.cpp
	M			core/dplugins/generic/tools/calendar/calendarplugin.cpp
	M			core/dplugins/generic/tools/expoblending/expoblendingplugin.cpp
	M			core/dplugins/generic/tools/htmlgallery/htmlgalleryplugin.cpp
	M			core/dplugins/generic/tools/jalbum/jalbumplugin.cpp
	M			core/dplugins/generic/tools/mediaserver/mediaserverplugin.cpp
	M			core/dplugins/generic/tools/panorama/panoramaplugin.cpp
	M			core/dplugins/generic/tools/printcreator/printcreatorplugin.cpp
	M			core/dplugins/generic/tools/sendbymail/sendbymailplugin.cpp
	M			core/dplugins/generic/tools/videoslideshow/videoslideshowplugin.cpp
	M			core/dplugins/generic/view/presentation/presentationplugin.cpp
	M			core/dplugins/generic/webservices/box/boxplugin.cpp
	M			core/dplugins/generic/webservices/dropbox/dbplugin.cpp
	M			core/dplugins/generic/webservices/facebook/fbplugin.cpp
	M			core/dplugins/generic/webservices/filetransfer/ftplugin.cpp
	M			core/dplugins/generic/webservices/flickr/flickrplugin.cpp
	M			core/dplugins/generic/webservices/google/gsplugin.cpp
	M			core/dplugins/generic/webservices/imageshack/imageshackplugin.cpp
	M			core/dplugins/generic/webservices/imgur/imgurplugin.cpp
	M			core/dplugins/generic/webservices/ipfs/ipfsplugin.cpp
	M			core/dplugins/generic/webservices/mediawiki/mediawikiplugin.cpp
	M			core/dplugins/generic/webservices/onedrive/odplugin.cpp
	M			core/dplugins/generic/webservices/pinterest/pplugin.cpp
	M			core/dplugins/generic/webservices/piwigo/piwigoplugin.cpp
	M			core/dplugins/generic/webservices/rajce/rajceplugin.cpp
	M			core/dplugins/generic/webservices/smugmug/smugplugin.cpp
	M			core/dplugins/generic/webservices/twitter/twitterplugin.cpp
	M			core/dplugins/generic/webservices/unified/unifiedplugin.cpp
	M			core/dplugins/generic/webservices/vkontakte/vkplugin.cpp
	M			core/dplugins/generic/webservices/yandexfotki/yfplugin.cpp
	M			project/bundles/appimage/data/AppRun
	M			project/bundles/mxe/config.sh