l10n daemon script 866dfb4e89 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"		2021-01-14 07:04:00 +01:00
..
declarative-plugin	Add a QRect to showWindowMenu	2020-11-22 21:47:31 +00:00
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
CMakeLists.txt	KCM KWin Decoration: Add module data	2020-10-07 12:29:02 +02:00
decorationmodel.cpp	[kcm/decoration] Port to KPluginLoader	2020-09-30 15:50:52 +02:00
decorationmodel.h	Prettify license headers	2020-08-07 19:57:56 +00:00
kcm.cpp	kcm/decorations: Fix thumbnail border size on theme change	2020-11-16 16:29:30 +00:00
kcm.h	kcm/decorations: Simplify border selection	2020-11-13 22:00:04 +01:00
kwindecoration.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwindecorationsettings.kcfg
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	2021-01-14 07:04:00 +01:00