kwin/data
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
..
kwin.upd
kwin3_plugin.pl
kwin3_plugin.upd
kwin_focus1.sh
kwin_focus1.upd
kwin_focus2.sh
kwin_focus2.upd
kwiniconify.upd
kwinsticky.upd
kwinupdatewindowsettings.upd
Makefile.am
pluginlibFix.pl
pop.wav
update_window_settings.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00