<table><tr><td style="">subdiff updated this revision to Diff 20970.<br />subdiff added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D5931" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Merge current master.</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R120 Plasma Workspace</div></div></div><br /><div><strong>CHANGES SINCE LAST UPDATE</strong><div><a href="https://phabricator.kde.org/D5931?vs=14918&id=20970" rel="noreferrer">https://phabricator.kde.org/D5931?vs=14918&id=20970</a></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D5931" rel="noreferrer">https://phabricator.kde.org/D5931</a></div></div><br /><div><strong>AFFECTED FILES</strong><div><div>CMakeLists.txt<br />
libcolorcorrect/CMakeLists.txt<br />
libcolorcorrect/LibColorCorrectConfig.cmake.in<br />
libcolorcorrect/README<br />
libcolorcorrect/autotests/CMakeLists.txt<br />
libcolorcorrect/autotests/mock_kwin.cpp<br />
libcolorcorrect/autotests/mock_kwin.h<br />
libcolorcorrect/autotests/nightcolortest.cpp<br />
libcolorcorrect/autotests/qtest_dbus.h<br />
libcolorcorrect/colorcorrectconstants.h<br />
libcolorcorrect/compositorcoloradaptor.cpp<br />
libcolorcorrect/compositorcoloradaptor.h<br />
libcolorcorrect/declarative/CMakeLists.txt<br />
libcolorcorrect/declarative/colorcorrectplugin.cpp<br />
libcolorcorrect/declarative/colorcorrectplugin.h<br />
libcolorcorrect/declarative/qmldir<br />
libcolorcorrect/geolocator.cpp<br />
libcolorcorrect/geolocator.h<br />
libcolorcorrect/kded/CMakeLists.txt<br />
libcolorcorrect/kded/colorcorrectlocationupdater.desktop<br />
libcolorcorrect/kded/locationupdater.cpp<br />
libcolorcorrect/kded/locationupdater.h<br />
libcolorcorrect/suncalc.cpp<br />
libcolorcorrect/suncalc.h</div></div></div><br /><div><strong>To: </strong>subdiff, Plasma<br /><strong>Cc: </strong>leezu, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart<br /></div>