yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/kcmkwin/kwindecoration
History
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
..
buttons.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
buttons.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kwindecoration.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kwindecoration.desktop SVN_SILENT made messages (.desktop file) 2005-07-25 04:26:26 +00:00
kwindecoration.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
kwindecorationIface.h SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
Makefile.am As kdelibs/NAMING says, using lib<appname>.la as name for a library is bad. 2003-09-17 14:23:53 +00:00
pixmaps.h SVN_SILENT update FSF address 2005-07-10 13:44:16 +00:00
preview.cpp svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00
preview.h svn merge svn+ssh://coolo@svn.kde.org/home/kde/trunk/KDE/kdebase@438057 2005-07-28 14:59:42 +00:00