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	KCM KWinDecoration port to KConfigXT	2020-01-14 11:01:10 +01:00
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	[kcms/kwindecoration] Fix saving of window decoration plugin	2020-01-21 18:41:59 +00:00
kwindecorationsettings.kcfgc	Merge branch 'Plasma/5.19'	2020-06-24 17:26:19 +03:00
Messages.sh	Revert "[kcm/effects] Clip ListView"	2020-02-22 11:53:59 +01:00
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