l10n daemon script 59b1dee55a 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-17 06:42:32 +01:00
..
common
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinscripts	KCM KWinScripts implement KCModuleData to highlight default at module level	2021-01-05 08:53:04 +00:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-17 06:42:32 +01:00
CMakeLists.txt