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

2016-02-22 10:53:01 +00:00

..

CMakeLists.txt

default theme follows color scheme

2016-02-17 12:08:31 +01:00

colors

default theme follows color scheme

2016-02-17 12:08:31 +01:00

metadata.desktop

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

2016-02-22 10:53:01 +00:00