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
..
2010-06-21 13:17:45 +00:00
2010-04-28 17:39:12 +00:00
2009-11-25 01:08:35 +00:00
2009-11-25 01:08:35 +00:00
2009-11-25 01:08:35 +00:00
2010-10-12 19:33:15 +00:00
2010-09-27 18:16:27 +00:00
2009-11-25 01:08:35 +00:00
2009-11-25 01:08:35 +00:00
2010-01-18 18:24:57 +00:00
2010-02-22 11:21:30 +00:00
2010-07-24 00:52:37 +00:00
2009-11-25 01:08:35 +00:00
2010-01-18 18:24:57 +00:00
2011-05-06 21:51:55 +02:00
2009-11-25 01:08:35 +00:00
2010-06-03 22:08:18 +00:00
2009-11-17 01:48:12 +00:00
2009-11-17 01:48:12 +00:00
2010-10-04 21:48:06 +00:00
2011-04-29 11:17:30 +02:00
2011-05-26 23:13:44 +02:00
2011-04-29 11:17:30 +02:00
2010-11-08 17:25:12 +00:00
2011-08-07 00:50:20 +02:00
2009-11-25 01:08:35 +00:00
2009-11-25 01:08:35 +00:00