l10n daemon script 31cdb8676d 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-05-03 01:21:56 +00:00
..
common
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-05-03 01:21:56 +00:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-05-03 01:21:56 +00:00
CMakeLists.txt