Aaron Seigo 2c7751ccef Merge remote-tracking branch 'origin/KDE/4.7' into frameworks ... Conflicts: CMakeLists.txt kio/kio/kfileitem.cpp plasma/datacontainer.cpp plasma/datacontainer.h plasma/private/wallpaper_p.h plasma/private/wallpaperrenderthread.cpp		2011-10-30 10:44:59 +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	SVN_SILENT made messages (.desktop file)	2011-10-04 16:47:03 +02:00
servicetypes	Merge remote-tracking branch 'origin/KDE/4.7' into frameworks	2011-10-30 10:44:59 +01:00