l10n daemon script d81a137682 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"		2020-07-15 05:44:49 +02:00
..
CMakeLists.txt	Use ecm_qt_declare_logging_category to declare the logging categories	2020-05-26 18:55:47 +02:00
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-15 05:44:49 +02:00
photoplugin.cpp	Use ecm_qt_declare_logging_category to declare the logging categories	2020-05-26 18:55:47 +02:00
photoplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00