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
..
2010-10-31 22:21:23 +00:00
2011-04-29 11:17:28 +02:00
2011-07-15 14:09:19 +02:00
2011-05-26 16:02:56 +02:00
2011-07-21 15:18:54 +02:00
2011-05-26 17:22:48 +02:00
2011-04-29 11:17:31 +02:00
2011-04-29 11:17:31 +02:00
2008-11-03 23:08:39 +00:00