Stephen Kelly e23c2dfbd6 Merge remote-tracking branch 'origin/KDE/4.7' into frameworks ...

Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kstandarddirstest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	plasma/containment.cpp
	plasma/data/services/plasma.protocol
	plasma/popupapplet.cpp
	plasma/tooltipcontent.h
	plasma/widgets/videowidget.h

2011-08-25 19:43:08 +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

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

2011-08-25 19:43:08 +02:00

servicetypes

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

2011-08-25 19:43:08 +02:00