l10n daemon script d9ba7d78ad 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-04-29 02:56:02 +00:00
..
CMakeLists.txt	Cleanup all occurences of QT_MAJOR_VERSION in cmake	2023-12-28 17:49:07 +01:00
kcm.cpp	[kcm] Use correct KCModule constructor	2024-03-06 22:03:55 +00:00
kcm.h	[kcm] Use correct KCModule constructor	2024-03-06 22:03:55 +00:00
kcm.ui	kcm: Don't hardcode link color	2023-11-19 17:34:25 +05:30
kcm_kdeconnect.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-04-29 02:56:02 +00:00
Messages.sh	i18n	2013-09-04 21:19:02 +02:00