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
main.qml	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
presentwindows.cpp	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
presentwindows.desktop	SVN_SILENT made messages (.desktop file)	2013-06-10 03:46:39 +00:00
presentwindows.h	Merge branch 'master' into frameworks-scratch	2013-08-07 10:10:06 +02:00
presentwindows.kcfg	Use KConfigXT in PresentWindows Effect	2012-09-14 10:39:28 +02:00
presentwindows_config.cpp	Disable global shortcut handling in all effects	2013-07-24 09:58:44 +02:00
presentwindows_config.desktop	SVN_SILENT made messages (.desktop file)	2013-01-26 13:21:28 +01:00
presentwindows_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
presentwindows_config.ui	Remove close window mouse action from Present Windows effect	2013-02-11 09:04:06 +01:00
presentwindows_proxy.cpp	KWin uses kdelibs coding style.	2011-01-31 20:07:03 +01:00
presentwindows_proxy.h	Mark most ctors as explicit as reported by Krazy2 checker	2013-01-02 18:35:46 +01:00
presentwindowsconfig.kcfgc	Use KConfigXT in PresentWindows Effect	2012-09-14 10:39:28 +02:00