l10n daemon script debf06ea87 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"		2023-05-11 02:19:24 +00:00
..
convergentwindows	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-05-11 02:19:24 +00:00
CMakeLists.txt	Add REUSE headers	2023-03-06 05:57:45 +00:00