Commit graph

3 commits

Author SHA1 Message Date
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
Stephan Binner
4bd15b9f8f CVS_SILENT i18n style guide fixes, first run
svn path=/trunk/kdebase/kwin/; revision=385798
2005-02-03 10:49:53 +00:00
Luboš Luňák
a3d314ca4e Make the 'Edit' button for shortcut in window-specific settings
do at least something.

svn path=/trunk/kdebase/kwin/; revision=385467
2005-02-02 18:57:21 +00:00