l10n daemon script a1c0d43deb 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"		2020-07-23 06:10:20 +02:00
..
declarative-plugin	Clean #if version check blocks	2020-05-28 11:43:29 +00:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp	Clean #if version check blocks	2020-05-28 11:43:29 +00:00
kcm.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
kwindecorationsettings.kcfg
kwindecorationsettings.kcfgc	Merge branch 'Plasma/5.19'	2020-06-24 17:26:19 +03:00
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00