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/ui

port to new api

2014-02-04 17:29:28 +01:00

metadata.desktop

SVN_SILENT made messages (.desktop file)

2014-02-01 04:10:47 +00:00