969e6b85e7
Conflicts: CMakeLists.txt kwin/client.cpp kwin/effects/highlightwindow/highlightwindow.cpp kwin/libkwineffects/kwingltexture.cpp kwin/libkwineffects/kwinxrenderutils.cpp kwin/scene_opengl.cpp kwin/workspace.cpp plasma/desktop/applets/kickoff/CMakeLists.txt plasma/desktop/applets/taskmanager/package/contents/code/tools.js plasma/desktop/applets/taskmanager/package/contents/ui/Task.qml plasma/desktop/applets/taskmanager/package/contents/ui/main.qml plasma/desktop/applets/taskmanager/package/metadata.desktop plasma/desktop/applets/taskmanager/plugin/textlabel.h plasma/desktop/applets/tasks/CMakeLists.txt plasma/desktop/applets/tasks/package/metadata.desktop plasma/desktop/applets/tasks/tasks.cpp plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop plasma/generic/applets/activitybar/activitybar.cpp plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop |
||
---|---|---|
.. | ||
qml | ||
auroraeconfig.ui | ||
buttons.cpp | ||
buttons.h | ||
buttons.ui | ||
buttonsconfigdialog.cpp | ||
buttonsconfigdialog.h | ||
CMakeLists.txt | ||
config.ui | ||
configdialog.cpp | ||
configdialog.h | ||
decoration.ui | ||
decorationmodel.cpp | ||
decorationmodel.h | ||
kwindecoration.cpp | ||
kwindecoration.desktop | ||
kwindecoration.h | ||
Messages.sh | ||
pixmaps.h | ||
preview.cpp | ||
preview.h |