9291b18cee
Conflicts: CMakeLists.txt kwin/effects.cpp kwin/effects/logout/logout.cpp kwin/effects/presentwindows/main.qml kwin/effects/presentwindows/presentwindows.cpp kwin/effects/presentwindows/presentwindows.h kwin/effects/zoom/zoom_config.cpp kwin/libkwineffects/kwinglutils_funcs.cpp kwin/libkwineffects/kwinxrenderutils.cpp kwin/nvidiahack.cpp kwin/xcbutils.h plasma/desktop/containments/desktop/plasma-containment-desktop.desktop plasma/generic/wallpapers/image/image.cpp plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop |
||
---|---|---|
.. | ||
data | ||
CMakeLists.txt | ||
cube.cpp | ||
cube.desktop | ||
cube.h | ||
cube.kcfg | ||
cube_config.cpp | ||
cube_config.desktop | ||
cube_config.h | ||
cube_config.ui | ||
cube_inside.h | ||
cube_proxy.cpp | ||
cube_proxy.h | ||
cubeconfig.kcfgc | ||
cubeslide.cpp | ||
cubeslide.desktop | ||
cubeslide.h | ||
cubeslide.kcfg | ||
cubeslide_config.cpp | ||
cubeslide_config.desktop | ||
cubeslide_config.h | ||
cubeslide_config.ui | ||
cubeslideconfig.kcfgc |