kwin/plugins/kpackage/decoration
l10n daemon script 866dfb4e89 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2021-01-14 07:04:00 +01:00
..
CMakeLists.txt
decoration.cpp
decoration.h
kwin-packagestructure-decoration.desktop