alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13d5508112
plasma-framework/data/servicetypes
History
Stephen Kelly 13d5508112 Merge remote-tracking branch 'origin/KDE/4.8' into frameworks 
Conflicts:
	CMakeLists.txt
	kdecore/tests/kservicetest.cpp
	kdeui/dialogs/kconfigdialog.h
	kdeui/sonnet/configdialog.cpp
	kdeui/widgets/kpushbutton.cpp
	kdeui/widgets/kpushbutton.h
	kio/kfile/kpropertiesdialog.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcedata.h
	nepomuk/core/resourcemanager.cpp
	nepomuk/core/resourcemanager.h
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	nepomuk/query/queryparser.cpp
	tier1/solid/src/solid/backends/fstab/fstabmanager.cpp
	tier1/solid/src/solid/backends/fstab/fstabstorageaccess.cpp
2012-03-04 21:01:22 +01: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-01-19 09:08:22 +01: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-01-19 09:08:22 +01: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-02-25 15:44:16 +01:00
plasma-toolbox.desktop SVN_SILENT made messages (.desktop file) 2012-02-25 15:44:16 +01:00
plasma-wallpaper.desktop SVN_SILENT made messages (.desktop file) 2012-01-20 10:46:57 +01:00