l10n daemon script 5663500132 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-08-01 05:51:51 +02:00

..

testcontainment

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

2018-08-01 05:51:51 +02:00

CMakeLists.txt

Install all plasma files in a prefix/share/plasma directory

2014-04-27 17:14:22 +02:00