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 |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
resize.cpp | ||
resize.desktop | ||
resize.h | ||
resize.kcfg | ||
resize_config.cpp | ||
resize_config.desktop | ||
resize_config.h | ||
resize_config.ui | ||
resizeconfig.kcfgc |