24cf0e75f3
Conflicts: kwin/scene.cpp plasma/generic/applets/batterymonitor/metadata.desktop plasma/generic/applets/lock_logout/metadata.desktop |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
desktopgrid.cpp | ||
desktopgrid.desktop | ||
desktopgrid.h | ||
desktopgrid.kcfg | ||
desktopgrid_config.cpp | ||
desktopgrid_config.desktop | ||
desktopgrid_config.h | ||
desktopgrid_config.ui | ||
desktopgridconfig.kcfgc |