l10n daemon script 885d311b31 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-07-28 01:41:47 +00:00
..
CMakeLists.txt	Use target-centric CMake approach for declaring debug category	2023-07-22 20:51:19 +00:00
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-07-28 01:41:47 +00:00
photoplugin.cpp	Remove unneeded destructors from plugins	2023-07-22 16:01:21 +02:00
photoplugin.h	Do not mark plugin classes as exported	2023-07-22 20:51:19 +00:00