l10n daemon script de933e5924 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-03-11 04:52:36 +00:00
..
CMakeLists.txt	Use embedded JSON metadata & install KCM in new namespace	2022-12-30 09:19:13 +00:00
kcm.cpp	Remove unused KPluginInfo include	2022-12-06 19:44:15 +01:00
kcm.h	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00:00
kcm.ui	Port from KPluginSelector to new KPluginWidget class	2021-12-15 08:24:22 +01:00
kcm_kdeconnect.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-11 04:52:36 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00