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	Helper effect for KScreen integration	2013-06-04 17:06:42 +02:00
kscreen.cpp	Add missing kdebug include	2013-07-24 09:58:43 +02:00
kscreen.desktop	SVN_SILENT made messages (.desktop file)	2013-07-31 04:07:19 +00:00
kscreen.h	Helper effect for KScreen integration	2013-06-04 17:06:42 +02:00
kscreen.kcfg	Helper effect for KScreen integration	2013-06-04 17:06:42 +02:00
kscreenconfig.kcfgc	Helper effect for KScreen integration	2013-06-04 17:06:42 +02:00