l10n daemon script e884c4a9ac 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"		2016-09-18 09:32:51 +00:00
..
CMakeLists.txt	Find my phone plugin	2015-09-11 21:12:12 +02:00
findmyphoneplugin.cpp	More unused includes cleanup	2016-07-05 14:27:53 +02:00
findmyphoneplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
kdeconnect_findmyphone.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-18 09:32:51 +00:00