l10n daemon script cb6d7bda74 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"

2018-02-19 04:57:38 +01:00

..

contextmenu

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

2018-02-19 04:57:38 +01:00

CMakeLists.txt

add containmentactions

2018-02-03 20:56:30 +02:00