ngraham updated this revision to Diff 53832. ngraham added a comment.
Rebase and fix merge conflicts REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19606?vs=53804&id=53832 BRANCH reorganize-task-manager-context-menu (branched from master) REVISION DETAIL https://phabricator.kde.org/D19606 AFFECTED FILES applets/kimpanel/backend/scim/main.cpp applets/taskmanager/package/contents/ui/ContextMenu.qml applets/taskmanager/plugin/backend.cpp kcms/colors/editor/scmeditorcolors.cpp kcms/hardware/joystick/joywidget.cpp kcms/krdb/krdb.cpp To: ngraham, #plasma, #vdg, ndavis, hein Cc: abetts, broulik, ndavis, trickyricky26, plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, sebas, apol, mart
