Luboš Luňák ee040a6681 Merging from old trunk: ... r644597 | mueller | 2007-03-20 15:21:56 +0100 (Tue, 20 Mar 2007) | 2 lines pedantic-- svn path=/trunk/KDE/kdebase/workspace/; revision=659566		2007-04-30 12:23:20 +00:00
..
config	Merging from old trunk:	2007-04-29 22:04:13 +00:00
b2.desktop	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
b2client.cpp	Merging from old trunk:	2007-04-30 12:21:07 +00:00
b2client.h	Merging from old trunk:	2007-04-30 12:23:20 +00:00
bitmaps.h	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
CMakeLists.txt	Merging from old trunk:	2007-04-30 12:21:07 +00:00