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
..
kconfigxt	we'll need another file for the app specific values, so make these -global	2009-10-07 18:44:07 +00:00
knewstuff	only use scripted plasmoids as downloads	2010-02-24 00:29:37 +00:00
operations	new operations for Storage:	2010-11-02 22:05:48 +00:00
services	Merge remote-tracking branch 'origin/KDE/4.9' into frameworks	2012-07-02 15:53:39 +02:00
servicetypes	Merge remote-tracking branch 'origin/KDE/4.9' into frameworks	2012-07-02 15:53:39 +02:00