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 c5072f98de 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"		5 years ago
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	5 years ago
CMakeLists.txt	fix #453,substitute absolute build path references	8 years ago
metadata.desktop.cmake	SVN_SILENT made messages (.desktop file) - always resolve ours	5 years ago