l10n daemon script f4211e0431 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"		2021-04-22 01:12:28 +00: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	[app] Add plugin settings page	2020-09-08 20:33:20 +02:00
findthisdevice_config.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00: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	[app] Add plugin settings page	2020-09-08 20:33:20 +02:00
findthisdeviceplugin.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
kdeconnect_findthisdevice.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-19 01:18:23 +00:00
kdeconnect_findthisdevice_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-22 01:12:28 +00:00
kdeconnect_findthisdevice_config.qml	Add missing license headers	2021-02-27 20:04:47 +01:00