kwin/kcmkwin
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
..
kwincompositing SVN_SILENT made messages (.desktop file) 2013-08-04 04:29:45 +00:00
kwindecoration
kwindesktop
kwinoptions SVN_SILENT made messages (.desktop file) 2013-08-05 04:16:04 +00:00
kwinrules Merge branch 'master' into frameworks-scratch 2013-08-07 10:10:06 +02:00
kwinscreenedges SVN_SILENT made messages (.desktop file) 2013-07-31 04:07:19 +00:00
kwinscripts
kwintabbox
CMakeLists.txt