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
..
killer.cpp	svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057	2005-07-28 14:59:42 +00:00
Makefile.am	Merging back the process killing helper from kwin_iii to HEAD.	2003-09-16 19:32:34 +00:00