Martin Gräßlin 9291b18cee Merge branch 'master' into frameworks-scratch ... 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		2013-08-07 10:10:06 +02: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 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
desktopgrid.desktop	SVN_SILENT made messages (.desktop file)	2013-06-25 03:48:10 +00:00
desktopgrid.h	Port add/remove buttons in DesktopGrid to QtQuick 2	2013-08-05 14:55:37 +02:00
desktopgrid.kcfg	Use KConfigXT in DesktopGrid effect	2012-09-15 11:24:11 +02:00
desktopgrid_config.cpp	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02: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	Use KConfigXT in DesktopGrid effect	2012-09-15 11:24:11 +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