l10n daemon script acdd83e100 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-10-21 01:20:48 +00:00
..
CMakeLists.txt	Allow building against Qt6/KF6	2023-07-20 11:15:41 +03:00
kcm.cpp	Update old-style connect/disconnect where possible	2023-08-08 22:51:30 +02:00
kcm.h	KdeConnectKcm: Do not make generated UI class instance a ptr	2023-07-30 07:27:45 +00: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-10-21 01:20:48 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00