You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

l10n daemon script 09de9c13df 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"		4 years ago
..
contents	shortcuts:wait for view to fully shown properly	4 years ago
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	4 years ago