David Faure 8a2318f741 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks ... Conflicts: kfile/knewfilemenu.cpp		2012-01-16 14:25:19 +01:00
..
plasma-animator.desktop	SVN_SILENT made messages (.desktop file)	2011-12-22 11:44:55 +01:00
plasma-applet-popupapplet.desktop	SVN_SILENT made messages (.desktop file)	2012-01-07 09:21:08 +01:00
plasma-applet.desktop	SVN_SILENT made messages (.desktop file)	2012-01-14 09:38:32 +01:00
plasma-containment.desktop	SVN_SILENT made messages (.desktop file)	2012-01-14 09:38:32 +01:00
plasma-containmentactions.desktop	SVN_SILENT made messages (.desktop file)	2012-01-07 09:21:08 +01:00
plasma-dataengine.desktop	SVN_SILENT made messages (.desktop file)	2011-12-29 10:46:14 +01:00
plasma-packagestructure.desktop	Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks	2011-12-22 19:53:10 +01:00
plasma-runner.desktop	SVN_SILENT made messages (.desktop file)	2011-12-22 11:44:55 +01:00
plasma-scriptengine.desktop	SVN_SILENT made messages (.desktop file)	2012-01-14 09:38:32 +01:00
plasma-service.desktop	SVN_SILENT made messages (.desktop file)	2012-01-14 09:38:32 +01:00
plasma-toolbox.desktop	SVN_SILENT made messages (.desktop file)	2012-01-14 09:38:32 +01:00
plasma-wallpaper.desktop	SVN_SILENT made messages (.desktop file)	2011-12-22 11:44:55 +01:00