l10n daemon script b11d141169 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-01-16 10:59:59 +01:00
..
CMakeLists.txt	Move settings app into own folder and make it a KDBusService	2020-01-17 01:32:56 +01:00
kcm.cpp	Add a verification key that's displayed when pairing	2020-11-26 11:28:32 +01:00
kcm.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
kcm.ui	Add a verification key that's displayed when pairing	2020-11-26 11:28:32 +01:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-16 10:59:59 +01:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00