Diffusion digiKam 7d26ca8c9bc5

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

Authored by mqualmann on Jan 13 2019, 5:19 PM.

Description

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

Details

Committed
mqualmannJan 13 2019, 5:19 PM
Parents
R482:f4587bac53d8: unload all plugins at the end of the program
R482:2f04bcd895d1: port++
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2f04bcd895d1cgilles
port++ 
Jan 13 2019

Changes (12)

PathPackages
Mcore/dplugins/bqm/colors/whitebalanceplugin.cpp
Mcore/dplugins/editor/colors/CMakeLists.txt
Vcore/{dplugins/editor ← utilities/imageeditor/tools}/colors/whitebalancetool.cpp
Vcore/{dplugins/editor ← utilities/imageeditor/tools}/colors/whitebalancetool.h
Pcore/dplugins/editor/colors/whitebalancetoolplugin.cpp
Copied from core/dplugins/editor/colors/adjustcurvestoolplugin.cpp
Pcore/dplugins/editor/colors/whitebalancetoolplugin.h
Copied from core/dplugins/editor/colors/channelmixertoolplugin.h
Mcore/utilities/imageeditor/CMakeLists.txt
Mcore/utilities/imageeditor/editor/editorwindow.cpp
Mcore/utilities/imageeditor/editor/editorwindow.h
Dcore/utilities/imageeditor/tools/colors
Vcore/{utilities/imageeditor/tools → dplugins/editor}/colors/whitebalancetool.cpp
Vcore/{utilities/imageeditor/tools → dplugins/editor}/colors/whitebalancetool.h

R482:7d26ca8c9bc5

View Options

core/dplugins/bqm/colors/whitebalanceplugin.cpp

Loading...
View Options

core/dplugins/editor/colors/CMakeLists.txt

Loading...
View Options

core/dplugins/editor/colors/whitebalancetool.cpp

Loading...
View Options

core/dplugins/editor/colors/whitebalancetool.h

Loading...
View Options

core/dplugins/editor/colors/whitebalancetoolplugin.cpp

Loading...
View Options

core/dplugins/editor/colors/whitebalancetoolplugin.h

Loading...
View Options

core/utilities/imageeditor/CMakeLists.txt

Loading...
View Options

core/utilities/imageeditor/editor/editorwindow.cpp

Loading...
View Options

core/utilities/imageeditor/editor/editorwindow.h

Loading...
View Options

core/utilities/imageeditor/tools/colors

Loading...
View Options

core/utilities/imageeditor/tools/colors/whitebalancetool.cpp

Loading...
View Options

core/utilities/imageeditor/tools/colors/whitebalancetool.h

Loading...