l10n daemon script f6724de704 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"		2016-02-14 09:18:22 +00:00
..
contents/ui	do not runtime require Qt 5.5 for no good reason	2015-09-25 11:04:24 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-14 09:18:22 +00:00