leinir updated this revision to Diff 73597. leinir added a comment.
- Unbreak the merge REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D26544?vs=73595&id=73597 BRANCH switch-kcms-to-knsquick (branched from master) REVISION DETAIL https://phabricator.kde.org/D26544 AFFECTED FILES CMakeLists.txt kcms/colors/CMakeLists.txt kcms/colors/colors.cpp kcms/colors/colors.h kcms/colors/package/contents/ui/main.qml kcms/cursortheme/CMakeLists.txt kcms/cursortheme/kcmcursortheme.cpp kcms/cursortheme/kcmcursortheme.h kcms/cursortheme/package/contents/ui/main.qml kcms/desktoptheme/CMakeLists.txt kcms/desktoptheme/kcm.cpp kcms/desktoptheme/kcm.h kcms/desktoptheme/package/contents/ui/main.qml kcms/icons/CMakeLists.txt kcms/icons/main.cpp kcms/icons/main.h kcms/icons/package/contents/ui/main.qml kcms/ksplash/CMakeLists.txt kcms/ksplash/kcm.cpp kcms/ksplash/kcm.h kcms/ksplash/package/contents/ui/main.qml To: leinir, mart, ngraham Cc: bcooksley, davidedmundson, ngraham, plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, zachus, fbampaloukas, GB_2, ragreen, ZrenBot, alexeymin, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart
