Commit graph

5 commits

Author SHA1 Message Date
Markus Meik Slopianka
6374f08355 revert. sorry
svn path=/trunk/KDE/kdebase/workspace/; revision=1154460
2010-07-25 14:19:05 +00:00
Markus Meik Slopianka
0104c110eb Move dated looking themes to kdeartwork as discussed on kwin mailing list
svn path=/trunk/KDE/kdebase/workspace/; revision=1154445
2010-07-25 14:00:45 +00:00
Luboš Luňák
f52b8e48cd branches/work/kwin_composite becomes new trunk kwin.
svn path=/trunk/KDE/kdebase/workspace/; revision=659202
2007-04-29 17:35:43 +00:00
Luboš Luňák
2b7e1f4993 Remove kwin, kwin_composite will become new trunk kwin, missing merges
from trunk will be merged in.


svn path=/trunk/KDE/kdebase/workspace/; revision=659200
2007-04-29 17:34:49 +00:00
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