l10n daemon script fdfcfd53d1 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"		2023-09-26 03:15:50 +00:00
..
CMakeLists.txt	Use embedded JSON metadata & install KCM in new namespace	2022-12-30 09:19:13 +00:00
kcm.cpp	clang-format pass	2023-07-16 16:20:34 +02:00
kcm.h	clang-format pass	2023-07-16 16:20:34 +02:00
kcm.ui	Refactor PairingHandler	2023-06-02 16:38:52 +00:00
kcm_kdeconnect.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-09-26 03:15:50 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00