l10n daemon script 9799456f3b 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-12-09 06:48:24 +01:00
..
common
kwincompositing
kwindecoration
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-09 06:48:24 +01:00
kwineffects
kwinoptions	Revert "Change the defaults for active screen"	2020-12-03 12:04:10 +02:00
kwinrules	kcm/rules: Add a Duplicate action to rules list	2020-11-29 00:16:51 +01:00
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt