kwin/effects/startupfeedback
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
..
data Remove textureWidth/textureHeight from all Shaders 2011-06-19 20:54:13 +02:00
CMakeLists.txt StartupFeedback ported to GLES. 2011-01-30 14:12:05 +01:00
startupfeedback.cpp Merge branch 'master' into frameworks-scratch 2013-08-07 10:10:06 +02:00
startupfeedback.desktop SVN_SILENT made messages (.desktop file) 2013-06-10 03:46:39 +00:00
startupfeedback.h Use mgraesslin@kde.org for my mail address in Copyright and AboutData 2013-03-12 13:17:53 +01:00