f750fef8b7
Conflicts: CMakeLists.txt kcmkwin/kwincompositing/kcmkwineffects.desktop kcmkwin/kwincompositing/kwincompositing.desktop kcmkwin/kwindecoration/kwindecoration.desktop kcmkwin/kwindesktop/desktop.desktop kcmkwin/kwinoptions/kwinactions.desktop kcmkwin/kwinoptions/kwinadvanced.desktop kcmkwin/kwinoptions/kwinfocus.desktop kcmkwin/kwinoptions/kwinmoving.desktop kcmkwin/kwinoptions/kwinoptions.desktop kcmkwin/kwinrules/kwinrules.desktop kcmkwin/kwinscreenedges/kwinscreenedges.desktop kcmkwin/kwintabbox/kwintabbox.desktop scripts/enforcedeco/metadata.desktop |
||
---|---|---|
.. | ||
desktopchangeosd | ||
enforcedeco | ||
synchronizeskipswitcher | ||
videowall | ||
CMakeLists.txt | ||
Messages.sh |