Aaron Seigo 8eb06eee32 Merge branch 'KDE/4.7' ...

Conflicts:
	CMakeLists.txt
	cmake/modules/FindNepomuk.cmake
	kdecore/tests/kservicetest.cpp
	kdeui/util/kkeyserver.h
	kio/kio/accessmanagerreply_p.h
	kio/kio/hostinfo.cpp
	kioslave/http/http.h
	kioslave/http/httpauthentication.cpp
	kioslave/http/httpauthentication.h
	kioslave/http/tests/httpauthenticationtest.cpp
	kioslave/http/tests/httpheaderdispositiontest.cpp
	kparts/browseropenorsavequestion.cpp
	plasma/data/services/plasma.protocol
	plasma/wallpaper.cpp
	plasma/widgets/videowidget.h
	solid/solid/backends/wmi/wmiquery.cpp

2011-10-31 15:25:10 +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 branch 'KDE/4.7'

2011-10-31 15:25:10 +01:00

servicetypes

SVN_SILENT made messages (.desktop file)

2011-10-22 14:56:58 +02:00