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	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
Makefile.am	port quartz to KCommonDecoration	2005-03-21 15:53:41 +00:00
quartz.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
quartz.desktop	SVN_SILENT made messages (.desktop file)	2005-07-25 04:26:26 +00:00
quartz.h	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00