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
..
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/master' into origin-frameworks	2013-01-04 17:39:36 +01:00
servicetypes	Merge remote-tracking branch 'origin/master' into origin-frameworks	2013-01-04 17:39:36 +01:00