kwin/packageplugins/decoration
l10n daemon script 644f595df6 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"
2017-10-29 04:58:06 +01:00
..
CMakeLists.txt
decoration.cpp
decoration.h
kwin-packagestructure-decoration.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-10-29 04:58:06 +01:00