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 SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwintranslucency.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
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 SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
Makefile.am Added composite (translucency/shadows) support 2005-01-15 17:07:48 +00:00
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 SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
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