430ca2a33e
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" |
||
---|---|---|
.. | ||
declarative-plugin | ||
package | ||
CMakeLists.txt | ||
decorationmodel.cpp | ||
decorationmodel.h | ||
kcm.cpp | ||
kcm.h | ||
kwindecoration.desktop | ||
kwindecorationsettings.kcfg | ||
kwindecorationsettings.kcfgc | ||
Messages.sh | ||
utils.cpp | ||
utils.h | ||
window-decorations.knsrc |