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

2017-09-16 05:06:42 +02:00

..

separator

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

2017-09-16 05:06:42 +02:00

spacer

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

2017-09-16 05:06:42 +02:00

CMakeLists.txt

fix #572,support latte spacer

2017-07-28 03:09:01 +03:00