Stephan Kulow b464518b3c svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 ... svn+ssh://coolo@svn.kde.org/home/kde/branches/work/kde4/kdebase . I couldn't resolve one kicker conflict that results from different development directions, so I rely on Aaron to sort it out - the file is commited with conflicts svn path=/trunk/KDE/kdebase/kwin/; revision=439627		2005-07-28 14:59:42 +00:00
..
config	update FSF address	2005-07-04 19:02:09 +00:00
Makefile.am	oups... no shadow.cpp anymore.	2005-03-19 16:30:34 +00:00
misc.cpp	update FSF address	2005-07-04 19:02:09 +00:00
misc.h	update FSF address	2005-07-04 19:02:09 +00:00
plastik.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
plastik.desktop	CVS_SILENT made messages (.desktop file)	2005-03-07 09:05:40 +00:00
plastik.h	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
plastikbutton.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
plastikbutton.h	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
plastikclient.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
plastikclient.h	update FSF address	2005-07-04 19:02:09 +00:00