l10n daemon script b7982c3724 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-08-29 01:36:14 +00:00
..
CMakeLists.txt	kdeconnect_add_plugin: Autogenerate logging category	2023-08-07 19:47:41 +02:00
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-08-29 01:36:14 +00:00
photoplugin.cpp	plugins: Use QLatin1String::arg for faster and simpler string concatination	2023-08-28 17:20:46 +00:00
photoplugin.h	plugins: Prefer using statements with baseclass over empty constructor	2023-08-07 19:28:37 +02:00