Commit graph

1 commit

Author SHA1 Message Date
Lucas Murray
117c719c7d Merge branch 'fadeeffect'
Conflicts:
	kcmkwin/kwincompositing/main.cpp

svn path=/trunk/KDE/kdebase/workspace/; revision=911326
2009-01-15 09:55:15 +00:00