l10n daemon script 27c76fbb3e 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-12-16 01:36:49 +00:00

..

CMakeLists.txt

GIT_SILENT Update my email in copyright etc.

2024-11-14 20:19:15 +01:00

mltpreview.cpp

Drop support for Qt5

2024-08-29 10:20:17 +00:00

mltpreview.h

Port away from deprecated ThumbCreator

2023-01-13 16:17:34 +00:00

mltpreview.json

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

2024-12-16 01:36:49 +00:00