Stephen Kelly 13d5508112 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks ... Conflicts: CMakeLists.txt kdecore/tests/kservicetest.cpp kdeui/dialogs/kconfigdialog.h kdeui/sonnet/configdialog.cpp kdeui/widgets/kpushbutton.cpp kdeui/widgets/kpushbutton.h kio/kfile/kpropertiesdialog.cpp nepomuk/core/resourcedata.cpp nepomuk/core/resourcedata.h nepomuk/core/resourcemanager.cpp nepomuk/core/resourcemanager.h nepomuk/core/resourcewatcher.cpp nepomuk/core/resourcewatcher.h nepomuk/query/queryparser.cpp tier1/solid/src/solid/backends/fstab/fstabmanager.cpp tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp		2012-03-04 21:01:22 +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/KDE/4.8' into frameworks	2012-03-04 21:01:22 +01:00
servicetypes	Merge remote-tracking branch 'origin/KDE/4.8' into frameworks	2012-03-04 21:01:22 +01:00