l10n daemon script 835be41511 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"		2019-12-25 05:45:20 +01:00
..
CMakeLists.txt	[plugins/photo] Don't link against KI18n	2019-03-11 19:11:26 +01:00
kdeconnect_photo.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-25 05:45:20 +01:00
photoplugin.cpp	[plugins/photo] Remove requests from queue when cancel packet is received	2019-07-20 13:42:50 +00:00
photoplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00