plasma-framework/data/servicetypes
David Faure 656d7a2d99 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks
Conflicts:
	CMakeLists.txt (version)
	plasma/data/services/plasma-applet-extenderapplet.desktop (deleted in frameworks)
2012-01-23 11:06:24 +01:00
..
plasma-animator.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-applet-popupapplet.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-applet.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-containment.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-containmentactions.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-dataengine.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-packagestructure.desktop Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 2012-01-23 11:06:24 +01:00
plasma-runner.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-scriptengine.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-service.desktop SVN_SILENT made messages (.desktop file) 2012-01-20 10:46:57 +01:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2012-01-20 10:46:57 +01:00