subdiff updated this revision to Diff 20970. subdiff added a comment.
Merge current master. REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D5931?vs=14918&id=20970 REVISION DETAIL https://phabricator.kde.org/D5931 AFFECTED FILES CMakeLists.txt libcolorcorrect/CMakeLists.txt libcolorcorrect/LibColorCorrectConfig.cmake.in libcolorcorrect/README libcolorcorrect/autotests/CMakeLists.txt libcolorcorrect/autotests/mock_kwin.cpp libcolorcorrect/autotests/mock_kwin.h libcolorcorrect/autotests/nightcolortest.cpp libcolorcorrect/autotests/qtest_dbus.h libcolorcorrect/colorcorrectconstants.h libcolorcorrect/compositorcoloradaptor.cpp libcolorcorrect/compositorcoloradaptor.h libcolorcorrect/declarative/CMakeLists.txt libcolorcorrect/declarative/colorcorrectplugin.cpp libcolorcorrect/declarative/colorcorrectplugin.h libcolorcorrect/declarative/qmldir libcolorcorrect/geolocator.cpp libcolorcorrect/geolocator.h libcolorcorrect/kded/CMakeLists.txt libcolorcorrect/kded/colorcorrectlocationupdater.desktop libcolorcorrect/kded/locationupdater.cpp libcolorcorrect/kded/locationupdater.h libcolorcorrect/suncalc.cpp libcolorcorrect/suncalc.h To: subdiff, #plasma Cc: leezu, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
