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
..
ScalePage.qml	A bit more text, conditional alignment	2014-01-27 18:22:54 +01:00
testtheme.qml	port to new api	2014-02-04 17:29:28 +01:00
UnitsPage.qml	Clean removed API from units test	2014-02-03 16:42:29 +01:00