kwin/kcmkwin/kwinoptions
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
..
AUTHORS
ChangeLog
kwinactions.desktop
kwinadvanced.desktop
kwinfocus.desktop
kwinmoving.desktop
kwinoptions.desktop
kwintranslucency.desktop
main.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
main.h
Makefile.am
mouse.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
mouse.h
windows.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
windows.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00