l10n daemon script 63a0b4133e 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-04-12 10:31:39 +00:00
..
aurorae	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-12 10:31:39 +00:00
CMakeLists.txt
Messages.sh