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
..
Makefile.am	Port Web to KCommonDecoration, add buttons keep above/below others, shade, menu while I'm at it...	2005-03-21 19:57:25 +00:00
Web.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
web.desktop	SVN_SILENT made messages (.desktop file)	2005-07-25 04:26:26 +00:00
Web.h	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
WebButton.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
WebButton.h	update FSF address	2005-07-04 19:02:09 +00:00