l10n daemon script d953d7bf98 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-06-18 05:45:10 +02:00

..

package

SVN_SILENT made messages (.desktop file) - always resolve ours

2020-06-18 05:45:10 +02:00

CMakeLists.txt

fix #453,substitute absolute build path references

2017-05-10 18:03:31 +03:00

metadata.desktop.cmake

SVN_SILENT made messages (.desktop file) - always resolve ours

2020-06-18 05:45:10 +02:00