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	CMake cleanup	2020-11-16 12:21:07 +00:00
kcm.cpp	Add a verification key that's displayed when pairing	2020-11-26 11:28:49 +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:49 +01:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-22 01:12:28 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00