Merge branch 'master' into 7.0.0

Authored by cgilles on Sep 29 2019, 7:30 PM.

Description

Merge branch 'master' into 7.0.0

Merged Changes

CommitAuthorDetailsCommitted
79e4804bc8f9cgilles
Merge branch 'master' of invent.kde.org:kde/digikam 
Sep 29 2019
e85c52d694cccgilles
prepare code to implement HEIF save operation 
Sep 29 2019
f38121a1a124cgilles
add libx265 and ImageMAgick in macports build 
Sep 29 2019
f1096d2eb7aacgilles
add libx265 in MXE build 
Sep 29 2019
fb8c7a34ac42mqualmann
debug message only if loading not canceled 
Sep 29 2019