mart updated this revision to Diff 22656. mart added a comment.
- Merge branch 'master' into kcm-redesign/cursorTheme - remove spurious changes to resync with master REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D8692?vs=22649&id=22656 BRANCH kcm-redesign/cursorTheme REVISION DETAIL https://phabricator.kde.org/D8692 AFFECTED FILES CMakeLists.txt kcmcontrols/GridDelegate.qml kcmcontrols/GridView.qml kcmcontrols/GridViewPage.qml kcmcontrols/qmldir kcms/cursortheme/CMakeLists.txt kcms/cursortheme/Messages.sh kcms/cursortheme/cursortheme.desktop kcms/cursortheme/kcm_cursortheme.desktop kcms/cursortheme/kcmcursortheme.cpp kcms/cursortheme/kcmcursortheme.h kcms/cursortheme/package/contents/ui/Delegate.qml kcms/cursortheme/package/contents/ui/main.qml kcms/cursortheme/package/metadata.desktop kcms/cursortheme/xcursor/cursortheme.h kcms/cursortheme/xcursor/itemdelegate.cpp kcms/cursortheme/xcursor/itemdelegate.h kcms/cursortheme/xcursor/previewwidget.cpp kcms/cursortheme/xcursor/previewwidget.h kcms/cursortheme/xcursor/sortproxymodel.cpp kcms/cursortheme/xcursor/sortproxymodel.h kcms/cursortheme/xcursor/thememodel.cpp kcms/cursortheme/xcursor/thememodel.h kcms/cursortheme/xcursor/themepage.cpp kcms/cursortheme/xcursor/themepage.h kcms/cursortheme/xcursor/themepage.ui kcms/cursortheme/xcursor/xcursortheme.cpp kcms/cursortheme/xcursor/xcursortheme.h To: mart, #plasma Cc: davidedmundson, aspotashev, januz, ngraham, subdiff, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart