plasma-framework/data/services
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.protocol SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00