l10n daemon script f98953380f 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"		2020-05-31 20:22:34 +02:00
..
CMakeLists.txt	Use ecm_qt_declare_logging_category to declare the logging categories	2020-05-26 18:55:47 +02:00
findthisdevice_config.cpp	Port away from deprecated KIO/KCM functions	2019-12-20 00:23:49 +00:00
findthisdevice_config.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01: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	Use ecm_qt_declare_logging_category to declare the logging categories	2020-05-26 18:55:47 +02:00
findthisdeviceplugin.h	Use ecm_qt_declare_logging_category to declare the logging categories	2020-05-26 18:55:47 +02:00
kdeconnect_findthisdevice.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-09 11:01:28 +02:00
kdeconnect_findthisdevice_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-05-31 20:22:34 +02:00