l10n daemon script daa164bea1 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-08-28 01:25:08 +00:00

..

CMakeLists.txt

Cleanup all occurences of QT_MAJOR_VERSION in cmake

2023-12-28 17:49:07 +01:00

kdeconnect_remotesystemvolume.json

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

2024-08-28 01:25:08 +00:00

remotesystemvolumeplugin.cpp

plugins: Use QLatin1String::arg for faster and simpler string concatination

2023-08-28 17:20:46 +00:00

remotesystemvolumeplugin.h

plugins: Prefer using statements with baseclass over empty constructor

2023-08-07 19:28:37 +02:00