l10n daemon script 7c6cabf4a1 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-12-20 06:16:31 +01:00
..
contents	multitouch input support	2020-11-13 15:24:01 +00:00
Messages.sh	add Messages.sh in shell and containments	2019-11-20 12:35:14 +05:30
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-20 06:16:31 +01:00