Marco Martin 3858044d25 Merge branch 'mart/AppletAttached' ... Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp		2014-02-06 13:16:11 +01:00
..
contents	Merge branch 'mart/AppletAttached'	2014-02-06 13:16:11 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file)	2014-02-06 04:12:17 +00:00