l10n daemon script 262a8392a5 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-11-14 02:08:47 +00:00
..
convergentwindows
CMakeLists.txt