plasma-framework

History

David Faure 76c6c3e483 Merge remote-tracking branch 'origin/master' into origin-frameworks

Conflicts:
	kio/tests/krununittest.cpp [findExe]
	kparts/partmanager.cpp [moc]
	staging/kde4support/autotests/kmimetypetest.cpp [similar change already here]
	staging/kde4support/autotests/kmimetypetest.h [similar change already here]
	tier1/solid/src/solid/CMakeLists.txt [similar change already here]

2013-01-04 17:39:36 +01:00

plasma-applet.desktop

SVN_SILENT made messages (.desktop file)

2013-01-03 07:37:34 +01:00

plasma-containment.desktop

SVN_SILENT made messages (.desktop file)

2013-01-03 07:37:34 +01:00

plasma-containmentactions.desktop

SVN_SILENT made messages (.desktop file)

2013-01-03 07:37:34 +01:00

plasma-dataengine.desktop

SVN_SILENT made messages (.desktop file)