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
..
images	Play around with devicePixelRatio	2014-01-23 04:07:05 +01:00
ui	Merge branch 'mart/AppletAttached'	2014-02-06 13:16:11 +01:00