l10n daemon script 91abcdbcfa 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-02-17 05:51:10 +01:00
..
common
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-17 05:51:10 +01:00
kwindecoration	Extract messages from header file as well, optimize extraction	2020-02-16 11:55:17 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-11 05:59:16 +01:00
kwinscripts
kwintabbox
CMakeLists.txt