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

2024-07-15 01:18:59 +00:00

..

CMakeLists.txt

Port to ecm_add_qml_module

2024-07-06 19:50:20 +02:00

purposeplugin.cpp

Add purpose plugin

2024-03-11 20:07:00 +01:00

purposeplugin.json

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

2024-07-15 01:18:59 +00:00