afbc5222e1
Conflicts: CMakeLists.txt doc/kcontrol/screensaver/index.docbook kcontrol/krdb/krdb.cpp kscreensaver/kblank_screensaver/kblank.desktop kscreensaver/krandom_screensaver/krandom.desktop kscreensaver/libkscreensaver/main.cpp ksplash/ksplashqml/SplashApp.cpp kstyles/oxygen/config/main.cpp kstyles/oxygen/demo/main.cpp kstyles/oxygen/oxygenstylehelper.cpp kwin/clients/oxygen/config/oxygenexceptiondialog.cpp kwin/clients/oxygen/config/ui/oxygenconfigurationui.ui kwin/clients/oxygen/config/ui/oxygenexceptiondialog.ui kwin/clients/oxygen/demo/main.cpp kwin/clients/oxygen/oxygenconfigdata.kcfg kwin/egl_wayland_backend.cpp kwin/eglonxbackend.h kwin/glxbackend.cpp kwin/glxbackend.h kwin/kcmkwin/kwinoptions/kwinactions.desktop kwin/scene_opengl.cpp kwin/scene_opengl.h plasma/desktop/applets/pager/pager.cpp plasma/desktop/shell/activitymanager/activitymanager.cpp plasma/desktop/shell/activitymanager/activitymanager.h plasma/desktop/shell/controllerwindow.cpp plasma/desktop/shell/data/plasma-desktop.desktop plasma/generic/dataengines/geolocation/geolocation.cpp plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop plasma/generic/wallpapers/image/image.cpp plasma/generic/wallpapers/image/image.h |
||
---|---|---|
.. | ||
config | ||
data | ||
demo | ||
CMakeLists.txt | ||
oxygenbutton.cpp | ||
oxygenbutton.h | ||
oxygenclient.cpp | ||
oxygenclient.desktop | ||
oxygenclient.h | ||
oxygenclientgroupitemdata.cpp | ||
oxygenclientgroupitemdata.h | ||
oxygenconfigdata.kcfg | ||
oxygenconfiguration.kcfgc | ||
oxygendecohelper.cpp | ||
oxygendecohelper.h | ||
oxygendecorationdefines.h | ||
oxygenexceptionlist.cpp | ||
oxygenexceptionlist.h | ||
oxygenfactory.cpp | ||
oxygenfactory.h | ||
oxygensizegrip.cpp | ||
oxygensizegrip.h | ||
oxygentitleanimationdata.cpp | ||
oxygentitleanimationdata.h |