l10n daemon script d9e7498593 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-01-24 12:53:38 +01:00
..
aurorae	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-24 12:53:38 +01:00
CMakeLists.txt	Drop specifying the default debug areas	2016-06-28 11:37:22 +02:00
Messages.sh