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

SVN_SILENT made messages (.desktop file)

2012-06-26 19:13:32 +02:00