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	Use a QDeclarativeView for button views in Present Windows and Desktop Grid	2013-03-12 08:40:46 +01:00
desktopgrid.cpp	Merge branch 'KDE/4.11'	2013-11-24 15:35:17 +01:00
desktopgrid.desktop	SVN_SILENT made messages (.desktop file)	2013-06-25 03:48:10 +00:00
desktopgrid.h	Port KWin effects away from KAction and KShortcut to Qt5/KF5 classes.	2013-08-15 04:13:12 +09:00
desktopgrid.kcfg	Use KConfigXT in DesktopGrid effect	2012-09-15 11:24:11 +02:00
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	SVN_SILENT made messages (.desktop file)	2013-01-28 13:20:08 +01:00
desktopgrid_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
desktopgrid_config.ui	KIntSpinBox -> QSpinBox in kwin/effects configs	2013-09-09 07:38:30 +02:00
desktopgridconfig.kcfgc	Use KConfigXT in DesktopGrid effect	2012-09-15 11:24:11 +02:00
main.qml	Port add/remove buttons in DesktopGrid to QtQuick 2	2013-08-05 14:55:37 +02:00