l10n daemon script 66e7212a4b 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"		2019-02-16 05:46:17 +01:00
..
declarative-plugin
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-16 05:46:17 +01:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-16 05:46:17 +01:00
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc