l10n daemon script 3ee29af814 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"		2023-01-01 02:14:13 +00:00
..
CMakeLists.txt	Adapt build system to also support Qt 6	2022-10-29 16:51:41 +02:00
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-01-01 02:14:13 +00:00
photoplugin.cpp	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00:00
photoplugin.h	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00:00