kwin/kcmkwin/kwinrules
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
..
detectwidget.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
detectwidget.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
detectwidgetbase.ui svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
editshortcutbase.ui svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kcm.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kcm.h SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
kwinrules.desktop SVN_SILENT made messages (.desktop file) 2005-07-11 04:39:55 +00:00
kwinsrc.cpp #84605 - make the Alt+F3/Advanced/Special window settings option find 2004-07-29 17:08:25 +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
Makefile.am Make the 'Edit' button for shortcut in window-specific settings 2005-02-02 18:57:21 +00:00
ruleslist.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
ruleslist.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
ruleslistbase.ui svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
ruleswidget.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
ruleswidget.h SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
ruleswidgetbase.ui svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00