3858044d25
Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
contents/ui | ||
platformcontents/application/tablet/ui | ||
metadata.desktop | ||
widgetgallery-tablet |
3858044d25
Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
contents/ui | ||
platformcontents/application/tablet/ui | ||
metadata.desktop | ||
widgetgallery-tablet |