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	If the intention was that this can be built as a separate project, this works now.	2009-01-04 18:15:55 +00:00
plasma-dataengine-testengine.desktop	SVN_SILENT made messages (.desktop file)	2012-06-26 19:13:32 +02:00
testengine.cpp	Don't use the QtGui module name in includes.	2012-02-02 10:35:53 +01:00
testengine.h	ok, this time JUST the plasma dir ;)	2008-11-03 23:08:39 +00:00