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 KConfigXT in FlipSwitch effect	2012-09-15 11:24:11 +02:00
flipswitch.cpp	Fix no cast to/from ASCII intrduced issues	2013-07-24 09:58:33 +02:00
flipswitch.desktop	SVN_SILENT made messages (.desktop file)	2013-08-03 04:00:09 +00:00
flipswitch.h	Change the way how effects can get mouse events	2013-05-03 08:15:42 +02:00
flipswitch.kcfg	general tabbox support for screenedges	2013-04-16 22:07:07 +02:00
flipswitch_config.cpp	Disable global shortcut handling in all effects	2013-07-24 09:58:44 +02:00
flipswitch_config.desktop	SVN_SILENT made messages (.desktop file)	2013-08-03 04:00:09 +00:00
flipswitch_config.h	Use Q_SLOTS and Q_SIGNALS instead of slots and signals	2013-07-24 09:46:54 +02:00
flipswitch_config.ui	Use KConfigXT in FlipSwitch effect	2012-09-15 11:24:11 +02:00
flipswitchconfig.kcfgc	Use KConfigXT in FlipSwitch effect	2012-09-15 11:24:11 +02:00