Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
contents/ui | ||
metadata.desktop |
Conflicts: src/declarativeimports/core/dialog.cpp src/scriptengines/qml/plasmoid/containmentinterface.cpp |
||
---|---|---|
.. | ||
contents/ui | ||
metadata.desktop |