kdeconnect-kde/plugins/findmyphone
l10n daemon script b72a3e53f6 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-31 09:30:09 +02:00
..
CMakeLists.txt Find my phone plugin 2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp Rename NetworkPackage -> NetworkPacket 2018-03-05 20:03:23 +01:00
findmyphoneplugin.h Rename NetworkPackage -> NetworkPacket 2018-03-05 20:03:23 +01:00
kdeconnect_findmyphone.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-03-31 09:30:09 +02:00