alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
809bbd7b14
plasma-framework/data/servicetypes
History
David Faure 809bbd7b14 Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 
Conflicts:
	CMakeLists.txt
	plasma/corona.h
	plasma/data/services/plasma-applet-extenderapplet.desktop
	plasma/data/servicetypes/plasma-packagestructure.desktop
2011-12-22 19:53:10 +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) 2011-05-08 09:42:51 +02:00
plasma-applet.desktop SVN_SILENT made messages (.desktop file) 2011-12-22 11:44:55 +01: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-12-22 11:44:55 +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) 2011-12-22 11:44:55 +01:00
plasma-service.desktop SVN_SILENT made messages (.desktop file) 2011-12-22 11:44:55 +01:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2011-12-22 11:44:55 +01:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2011-12-22 11:44:55 +01:00