l10n daemon script af8ed75b29 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"		2020-06-18 05:32:17 +02:00
..
contents/ui	Port away from Title and towards level 1 Heading	2020-02-21 08:39:25 -07:00
platformcontents/application/tablet/ui	port to new api	2014-02-04 17:29:28 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:32:17 +02:00
widgetgallery-tablet	add a bunch of test applets that already work	2013-09-04 11:57:46 +02:00