alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e23c2dfbd6
plasma-framework/data/servicetypes
History
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-animator.desktop SVN_SILENT made messages (.desktop file) 2011-05-10 12:06:21 +02:00
plasma-applet-popupapplet.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
plasma-applet.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
plasma-containment.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
plasma-containmentactions.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
plasma-dataengine.desktop SVN_SILENT made messages (.desktop file) 2011-05-10 12:06:21 +02:00
plasma-packagestructure.desktop and we're package to package-plasmastructure.desktop 2011-07-19 21:52:47 +02:00
plasma-runner.desktop SVN_SILENT made messages (.desktop file) 2011-05-10 12:06:21 +02:00
plasma-scriptengine.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00
plasma-service.desktop SVN_SILENT made messages (.desktop file) 2011-07-07 18:43:55 +02:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2011-07-07 18:43:55 +02:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2011-05-08 09:42:51 +02:00