Aaron Seigo 71d807c353 Merge remote branch 'origin/KDE/4.7' into frameworks ...

Conflicts:
	CMakeLists.txt
	kio/kfile/kfilemetadatareaderprocess.cpp
	plasma/CMakeLists.txt
	plasma/packagestructure.cpp
	plasma/private/packages.cpp
	threadweaver/Mainpage.dox

2011-12-04 14:25:38 +01:00

..

kconfig_updates

move our data files into a common place with some decent organization

2009-09-03 20:40:22 +00: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 branch 'origin/KDE/4.7' into frameworks

2011-12-04 14:25:38 +01:00

servicetypes

Merge remote branch 'origin/KDE/4.7' into frameworks

2011-12-04 14:25:38 +01:00