hein updated this revision to Diff 4527. hein marked an inline comment as done. hein added a comment.
Fix merge conflict with Kai's patch. REPOSITORY rPLASMADESKTOP Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D1896?vs=4522&id=4527 BRANCH master REVISION DETAIL https://phabricator.kde.org/D1896 AFFECTED FILES applets/taskmanager/package/contents/code/layout.js applets/taskmanager/package/contents/config/main.xml applets/taskmanager/package/contents/ui/ConfigGeneral.qml applets/taskmanager/package/contents/ui/MouseHandler.qml applets/taskmanager/package/contents/ui/Task.qml applets/taskmanager/package/contents/ui/main.qml EMAIL PREFERENCES https://phabricator.kde.org/settings/panel/emailpreferences/ To: hein, mart, davidedmundson Cc: plasma-devel, jensreuterberg, sebas
_______________________________________________ Plasma-devel mailing list Plasma-devel@kde.org https://mail.kde.org/mailman/listinfo/plasma-devel
