l10n daemon script 67216063fd 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"		2017-01-09 06:03:34 +01:00
..
contents/ui	try to start an activity before setting current	2016-10-07 12:53:30 +02:00
Messages.sh	add a very simple activity switcher	2016-09-05 16:05:48 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-09 06:03:34 +01:00