l10n daemon script b7e5392a7b 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-03-19 09:50:52 +00:00
..
signedPackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-19 09:50:52 +00:00
testfallbackpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-14 10:19:38 +00:00
testpackage	SVN_SILENT made messages (.desktop file)	2015-01-27 11:23:41 +00:00
background.svgz	add an autotest for some properties of FrameSvg	2014-07-21 19:38:11 +02:00