Aaron Seigo 8b09ffb51f Merge remote branch 'origin/KDE/4.7' into frameworks ...

Conflicts:
	plasma/corona.cpp
	plasma/packagemetadata.cpp
	plasma/private/packages.cpp
	plasma/theme.cpp

2011-12-20 11:57:49 +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 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