plasma-framework/data/servicetypes
David Faure d930917d95 Merge remote-tracking branch 'origin/KDE/4.9' into frameworks
Conflicts:
	CMakeLists.txt
	kdecore/tests/kstandarddirstest.cpp
	kdecore/tests/kurltest.cpp
	kdeui/actions/kaction.cpp
	kdeui/tests/CMakeLists.txt
	kio/kio/krun.cpp
	nepomuk/core/nepomukmainmodel.cpp [gone]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcemanager.cpp [gone]
	nepomuk/core/resourcemanager_p.h [gone]
	staging/kde4support/autotests/kmimetypetest.cpp [splitted out]
	staging/kwidgets/src/utils/kglobalsettings.cpp
	tier1/itemmodels/src/kviewstateserializer.cpp
2012-07-20 15:10:26 +02:00
..
plasma-animator.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-applet-popupapplet.desktop SVN_SILENT made messages (.desktop file) 2012-07-19 10:11:11 +02:00
plasma-applet.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-containment.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-containmentactions.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-dataengine.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-packagestructure.desktop Merge remote-tracking branch 'origin/KDE/4.8' into origin-frameworks 2012-01-23 11:06:24 +01:00
plasma-runner.desktop SVN_SILENT made messages (.desktop file) 2012-05-11 15:12:49 +02:00
plasma-scriptengine.desktop SVN_SILENT made messages (.desktop file) 2012-01-19 09:08:22 +01:00
plasma-service.desktop SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2012-06-26 19:13:32 +02:00