l10n daemon script 10de7b3763 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"		2020-07-23 09:50:37 +02:00
..
CMakeLists.txt	Move settings app into own folder and make it a KDBusService	2020-01-17 01:32:56 +01:00
kcm.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
kcm.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
kcm.ui	Fix ui file hint: KMessageWidget extends QFrame in KF5 times	2018-03-22 17:34:54 +01:00
kcm_kdeconnect.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 09:50:37 +02:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00