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
..
CMakeLists.txt	allow it to be built separately	2010-08-04 19:38:31 +00:00
config.ui	Fix ui files	2009-08-18 07:16:19 +00:00
plasma-containmentactions-test.desktop	SVN_SILENT made messages (.desktop file)	2012-06-26 19:13:32 +02:00
test.cpp	Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks	2012-02-14 12:32:25 +01:00
test.h	rename folder	2009-08-17 23:40:25 +00:00