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