kdeconnect-kde/plugins/findthisdevice
l10n daemon script 6879cf14cd 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"
2018-10-24 05:55:51 +02:00
..
CMakeLists.txt New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
findthisdevice_config.cpp New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
findthisdevice_config.h New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
findthisdevice_config.ui New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
findthisdeviceplugin.cpp New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
findthisdeviceplugin.h New plugin: Find this device (v2, now hopefully fine for all compilers) 2018-05-15 22:15:21 +02:00
kdeconnect_findthisdevice.json SVN_SILENT made messages (.desktop file) - always resolve ours 2018-10-24 05:55:51 +02:00
kdeconnect_findthisdevice_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-08-18 05:41:47 +02:00