l10n daemon script 8027ccd6d6 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-17 16:54:45 +02:00
..
declarative-plugin	Merge branch 'Plasma/5.18'	2020-05-06 15:15:42 +02:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 16:54:45 +02:00
CMakeLists.txt
decorationmodel.cpp
decorationmodel.h
kcm.cpp
kcm.h
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-17 16:54:45 +02:00
kwindecorationsettings.kcfg
kwindecorationsettings.kcfgc	Notify about decorations button order change	2020-03-07 15:19:24 +03: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-17 16:54:45 +02:00