kdeconnect-kde/plugins/photo
l10n daemon script 522ae367d6 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-03-06 06:04:16 +01:00
..
CMakeLists.txt Add plugin for taking photos on remote device 2019-03-04 23:57:08 +01:00
kdeconnect_photo.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-06 06:04:16 +01:00
photoplugin.cpp Add plugin for taking photos on remote device 2019-03-04 23:57:08 +01:00
photoplugin.h Add plugin for taking photos on remote device 2019-03-04 23:57:08 +01:00