98583160cb
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
components | ||
dpi | ||
kplugins | ||
testengine | ||
CMakeLists.txt | ||
dialog_fullscreen.qml | ||
dialog_minWidthHeightRepositioning.qml | ||
dialog_positioning2.qml | ||
dialog_positioning_parentrotated.qml | ||
dialog_positioning.qml | ||
dialog_resizeWithParent.qml | ||
dialog_sizeMoreThanMin.qml | ||
dialog_tooltip.qml | ||
dialog_visualParentChange.qml | ||
dialog.qml | ||
testborders.qml | ||
tooltip-icons.qml | ||
tooltip.qml |