l10n daemon script c718ba4b48 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-08-26 10:19:25 +00:00
..
2014-09-30 19:03:54 +02:00
2014-10-31 18:11:16 +01:00
2014-10-11 20:58:34 +02:00
2014-09-26 16:17:28 +02:00
2014-09-26 16:17:28 +02:00
2014-09-01 20:36:06 +02:00
2014-09-01 20:36:06 +02:00
2014-04-26 01:48:37 +02:00
2014-04-26 01:48:37 +02:00
2014-04-26 01:48:37 +02:00
2014-02-10 15:17:07 +01:00