l10n daemon script 30b516eceb 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-09-30 06:16:48 +02:00
..
declarative-plugin	Prettify license headers	2020-08-07 19:57:56 +00:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
CMakeLists.txt
decorationmodel.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
decorationmodel.h	Prettify license headers	2020-08-07 19:57:56 +00:00
kcm.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
kcm.h	Prettify license headers	2020-08-07 19:57:56 +00:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
kwindecorationsettings.kcfg
kwindecorationsettings.kcfgc
Messages.sh
utils.cpp	Prettify license headers	2020-08-07 19:57:56 +00:00
utils.h	Prettify license headers	2020-08-07 19:57:56 +00:00
window-decorations.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-26 05:57:20 +02:00