l10n daemon script f47f98da0b 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-09-28 05:58:18 +02:00

..

basic

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

2020-09-28 05:58:18 +02:00

CMakeLists.txt

Don't install plasmoid for now

2015-12-03 02:45:04 +01:00