l10n daemon script 1112188a8b 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"		2017-06-10 05:41:19 +02:00
..
aurorae
CMakeLists.txt
Messages.sh