plasma-framework/data/servicetypes
David Faure fc73e05210 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt [versioning]
	kio/kio/accessmanager.cpp [headers]
	tier1/solid/src/solid/backends/wmi/wmiacadapter.cpp [Q_EMIT]
	tier1/solid/src/solid/backends/wmi/wmibattery.cpp [Q_EMIT]
2012-07-02 15:53:39 +02: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-05-11 15:12:49 +02: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-06-26 19:13:32 +02:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00