l10n daemon script f383640c4d 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-10-12 01:21:35 +00:00
..
assets.qrc	Use QML ListView in KCM	2024-10-06 21:40:39 +00:00
CMakeLists.txt	Use QML ListView in KCM	2024-10-06 21:40:39 +00:00
kcm.cpp	Using KColorSchemeManager::KColorSchemeManager is deprecated	2024-10-10 08:51:57 +01:00
kcm.h	Use QML ListView in KCM	2024-10-06 21:40:39 +00:00
kcm.ui	Use QML ListView in KCM	2024-10-06 21:40:39 +00:00
kcm_kdeconnect.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-10-12 01:21:35 +00:00
list.qml	Add frame back to device list	2024-10-10 13:12:48 +00:00
Messages.sh	Use QML ListView in KCM	2024-10-06 21:40:39 +00:00