l10n daemon script a43bec738c 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"		2024-08-10 01:25:57 +00:00
..
CMakeLists.txt	Cleanup all occurences of QT_MAJOR_VERSION in cmake	2023-12-28 17:49:07 +01:00
kcm.cpp	Show pairing keys everywhere and always shorten to 8 chars	2024-05-18 20:26:48 +00:00
kcm.h	[kcm] Use correct KCModule constructor	2024-03-06 22:03:55 +00:00
kcm.ui	Add message about iPhones to message.	2024-06-24 20:41:09 +00:00
kcm_kdeconnect.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-08-10 01:25:57 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00