kwin/effects/desktopgrid
Thomas Lübking 26febda4a0 Merge branch 'KDE/4.11'
Conflicts:
	ksmserver/screenlocker/greeter/greeterapp.cpp
	ksmserver/screenlocker/greeter/greeterapp.h
	ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/main.qml
	kwin/libkwineffects/kwineffects.cpp
	kwin/useractions.cpp
	plasma/desktop/applets/window-list/metadata.desktop
	plasma/desktop/containments/panel/plasma-containment-panel.desktop
	plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
2013-11-24 15:35:17 +01:00
..
CMakeLists.txt
desktopgrid.cpp Merge branch 'KDE/4.11' 2013-11-24 15:35:17 +01:00
desktopgrid.desktop
desktopgrid.h Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes. 2013-08-15 04:13:12 +09:00
desktopgrid.kcfg
desktopgrid_config.cpp Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes. 2013-08-15 04:13:12 +09:00
desktopgrid_config.desktop
desktopgrid_config.h
desktopgrid_config.ui KIntSpinBox -> QSpinBox in kwin/effects configs 2013-09-09 07:38:30 +02:00
desktopgridconfig.kcfgc
main.qml