l10n daemon script c10fe06d06 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-06-18 05:44:57 +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-06-18 05:44:57 +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-06-18 05:44:57 +02:00
kwindecorationsettings.kcfg	[kcms/kwindecoration] Fix saving of window decoration plugin	2020-01-21 18:41:59 +00:00
kwindecorationsettings.kcfgc	Notify about decoration theme change	2020-05-31 19:55:38 +00:00
Messages.sh	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
utils.cpp
utils.h
window-decorations.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:44:57 +02:00