l10n daemon script 7c747e1591 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-24 09:53:59 +00:00
..
contents/ui	[scripting] Drop qmlRegisterType for QQuickWindow	2014-09-03 09:47:21 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-24 09:53:59 +00:00