l10n daemon script a0c1a57999 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"		2015-12-30 09:23:05 +00:00
..
CMakeLists.txt	Find my phone plugin	2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp	Fixed warning.	2015-09-12 03:37:05 -07:00
findmyphoneplugin.h	Find my phone plugin	2015-09-11 21:12:12 +02:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:23:05 +00:00