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
..
plasma-applet-extenderapplet.desktop	SVN_SILENT made messages (.desktop file)	2011-05-10 12:06:21 +02:00
plasma.protocol	Merge remote-tracking branch 'origin/KDE/4.7' into frameworks	2011-08-25 19:43:08 +02:00