Aaron Seigo bd10c7175e Merge remote-tracking branch 'origin/master' into libplasma2 ...

Conflicts:
	plasma/containment.cpp
	plasma/package.cpp
	plasma/packagestructure.cpp
	plasma/private/package_p.h
	plasma/scripting/scriptengine.cpp

2011-07-21 15:31:07 +02: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

SVN_SILENT made messages (.desktop file)

2011-07-15 09:32:55 +02:00

servicetypes

and we're package to package-plasmastructure.desktop

2011-07-19 21:52:47 +02:00