l10n daemon script ab85638946 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-01-04 06:12:32 +01:00
..
declarative-plugin	Remove deprecated method	2019-12-23 14:09:02 +01:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
CMakeLists.txt
decorationmodel.cpp	Remove some unused includes	2019-11-10 20:26:35 +01:00
decorationmodel.h
kcm.cpp	Remove deprecated method	2019-12-23 14:09:02 +01:00
kcm.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-01-04 06:12:32 +01:00
Messages.sh
utils.cpp
utils.h
window-decorations.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-17 05:41:38 +02:00