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.protocol

SVN_SILENT made messages (.desktop file)

2011-12-22 11:44:55 +01:00