kdeconnect-kde/plugins/findmyphone
l10n daemon script eddcaddaea 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"
2017-05-15 04:33:11 +02:00
..
CMakeLists.txt Find my phone plugin 2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
findmyphoneplugin.h Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
kdeconnect_findmyphone.json SVN_SILENT made messages (.desktop file) - always resolve ours 2017-05-15 04:33:11 +02:00