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
..
2013-09-04 18:14:53 +05:30
2013-09-04 20:12:21 +05:30