David Faure 76c6c3e483 Merge remote-tracking branch 'origin/master' into origin-frameworks ... Conflicts: kio/tests/krununittest.cpp [findExe] kparts/partmanager.cpp [moc] staging/kde4support/autotests/kmimetypetest.cpp [similar change already here] staging/kde4support/autotests/kmimetypetest.h [similar change already here] tier1/solid/src/solid/CMakeLists.txt [similar change already here]		2013-01-04 17:39:36 +01: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)	2013-01-03 07:37:34 +01: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