l10n daemon script c6aafe23de 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"		2015-12-06 09:17:34 +00:00
..
aurorae	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-06 09:17:34 +00:00
CMakeLists.txt
Messages.sh