Casian Andrei a46d247702 Revert "Merge branch 'color2'" ... This merge is incomplete and it does not include the review number of the associated review request. It should have been pushed as a single commit, because the merged commits were not intended to be published in their form. This reverts commit dcba90263069a221a5489b1915c5cf1ca39d090c, reversing changes made to 50ae07525c7fde07794e7548c3d6e5a69cb1a89d. Conflicts: kwin/scene_opengl.cpp kwin/scene_opengl.h		2012-11-13 22:19:32 +02:00
..
CMakeLists.txt	Add GHNS support for Scripted KWin Effects	2012-10-28 09:49:02 +01:00
Messages.sh	Remove temporary file	2008-07-02 07:04:51 +00: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
kwineffect.knsrc	Add GHNS support for Scripted KWin Effects	2012-10-28 09:49:02 +01:00
main.cpp	Revert "Merge branch 'color2'"	2012-11-13 22:19:32 +02:00
main.h	Add GHNS support for Scripted KWin Effects	2012-10-28 09:49:02 +01:00
main.ui	Revert "Merge branch 'color2'"	2012-11-13 22:19:32 +02:00