l10n daemon script dbe069edfa 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"		2023-12-17 02:07:26 +00:00
..
contents	components/hapticsplugin: Introduce direct haptics API for hfd-service	2023-11-15 08:13:25 -08:00
Messages.sh	lookandfeel: Rename folder to be have a consistent name with other shells	2023-04-02 19:58:41 -07:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-12-17 02:07:26 +00:00