kwin/kcmkwin/kwincompositing
Casian Andrei 8341d4406b Merge remote-tracking branch 'origin/master' into color2
Results in cleaner changes.
Put all the color correction stuff from SceneOpenGL in SceneOpenGL2.

Conflicts:
	kwin/eglonxbackend.cpp
	kwin/glxbackend.cpp
	kwin/scene.h
	kwin/scene_opengl.cpp
	kwin/scene_opengl.h
2012-09-23 11:57:38 +03:00
..
CMakeLists.txt Drop CompositingPrefs from Compositing KCM 2012-04-29 21:50:09 +02:00
interface_util.h When confirming compositing in the configuration module, 2008-08-15 11:09:07 +00:00
ktimerdialog.cpp KWin uses kdelibs coding style. 2011-01-31 20:07:03 +01:00
ktimerdialog.h KWin uses kdelibs coding style. 2011-01-31 20:07:03 +01:00
kwincompositing.desktop SVN_SILENT made messages (.desktop file) 2012-09-20 10:06:35 +02:00
main.cpp Implement color correction support 2012-08-20 20:37:25 +03:00
main.h Show detailed information why an effect cannot be loaded 2012-05-15 18:02:57 +02:00
main.ui CC: No html translatable text. Only <p> and <strong> remaining 2012-08-24 17:07:13 +03:00
Messages.sh Remove temporary file 2008-07-02 07:04:51 +00:00