rooty updated this revision to Diff 52673. rooty added a comment.
Resolve conflicts REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D19364?vs=52670&id=52673 BRANCH username-action-shadows (branched from master) REVISION DETAIL https://phabricator.kde.org/D19364 AFFECTED FILES CMakeLists.txt libtaskmanager/virtualdesktopinfo.cpp lookandfeel/contents/components/Clock.qml lookandfeel/contents/components/UserDelegate.qml lookandfeel/metadata.desktop shell/shellcorona.cpp To: rooty, #vdg, ngraham, filipf Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
