vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
kwin/clients
History
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
..
b2 svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
default svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
keramik svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kwmtheme SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
laptop svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
modernsystem svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
plastik svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
quartz svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
redmond svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
test SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
web svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
Makefile.am Added extraction of strings from .ui files 2004-10-17 11:48:28 +00:00
PORTING Make it possible to do all kinds of strange things when mousewheeling 2005-05-06 15:20:49 +00:00
REQUIREMENTS_FOR_CVS Speling fixe ;-) 2000-03-30 10:34:16 +00:00