Aaron Seigo 5727ade508 Merge remote branch 'origin/KDE/4.7' into frameworks ... Conflicts: kio/kfile/kfilemetadatareaderprocess.cpp		2011-11-28 11:00:27 +01:00
..
plasma-animator.desktop	SVN_SILENT made messages (.desktop file)	2011-05-10 12:06:21 +02:00
plasma-applet-popupapplet.desktop	SVN_SILENT made messages (.desktop file)	2011-05-08 09:42:51 +02:00
plasma-applet.desktop	SVN_SILENT made messages (.desktop file)	2011-05-08 09:42:51 +02:00
plasma-containment.desktop	SVN_SILENT made messages (.desktop file)	2011-05-08 09:42:51 +02:00
plasma-containmentactions.desktop	SVN_SILENT made messages (.desktop file)	2011-05-08 09:42:51 +02:00
plasma-dataengine.desktop	SVN_SILENT made messages (.desktop file)	2011-10-22 14:56:58 +02:00
plasma-packagestructure.desktop	and we're package to package-plasmastructure.desktop	2011-07-19 21:52:47 +02:00
plasma-runner.desktop	SVN_SILENT made messages (.desktop file)	2011-05-10 12:06:21 +02:00
plasma-scriptengine.desktop	SVN_SILENT made messages (.desktop file)	2011-11-22 21:19:16 +01:00
plasma-service.desktop	SVN_SILENT made messages (.desktop file)	2011-07-07 18:43:55 +02:00
plasma-toolbox.desktop	SVN_SILENT made messages (.desktop file)	2011-07-07 18:43:55 +02:00
plasma-wallpaper.desktop	SVN_SILENT made messages (.desktop file)	2011-05-08 09:42:51 +02:00