l10n daemon script 81349acd82 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"		2022-04-12 01:42:58 +00:00
..
CMakeLists.txt	Port deprecated KCMultiDialog methods & embed json metadata in KCM	2021-12-15 08:24:22 +01:00
kcm.cpp	Port from KPluginSelector to new KPluginWidget class	2021-12-15 08:24:22 +01:00
kcm.h	Convert license headers to SPDX expressions	2020-08-17 09:48:10 +00:00
kcm.ui	Port from KPluginSelector to new KPluginWidget class	2021-12-15 08:24:22 +01:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-12 01:42:58 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00