Luboš Luňák d7f9ad2bde Merging from old trunk: ... r648646 | goutte | 2007-03-31 23:40:43 +0200 (Sat, 31 Mar 2007) | 2 lines SVN_SILENT: xgettext does not like to have unbalanced quotes in a #warning svn path=/trunk/KDE/kdebase/workspace/; revision=659573		2007-04-30 12:31:56 +00:00
..
CMakeLists.txt	Merging from old trunk:	2007-04-30 11:32:47 +00:00
detectwidget.cpp	Merging from old trunk:	2007-04-29 22:30:07 +00:00
detectwidget.h	Merging from old trunk:	2007-04-29 22:30:07 +00:00
detectwidgetbase.ui	Merging from old trunk:	2007-04-29 22:30:07 +00:00
editshortcutbase.ui	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
kcm.cpp	Merging from old trunk:	2007-04-30 11:32:47 +00:00
kcm.h	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
kwinrules.desktop	SVN_SILENT made messages (.desktop file)	2007-04-30 05:06:54 +00:00
kwinsrc.cpp	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
main.cpp	Merging from old trunk:	2007-04-30 11:32:47 +00:00
Messages.sh	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
ruleslist.cpp	Merging from old trunk:	2007-04-30 12:00:58 +00:00
ruleslist.h	Merging from old trunk:	2007-04-30 11:55:02 +00:00
ruleslistbase.ui	Merging from old trunk:	2007-04-30 11:55:02 +00:00
ruleswidget.cpp	Merging from old trunk:	2007-04-30 12:31:56 +00:00
ruleswidget.h	branches/work/kwin_composite becomes new trunk kwin.	2007-04-29 17:35:43 +00:00
ruleswidgetbase.ui	Merging from old trunk:	2007-04-30 11:56:47 +00:00