kdeconnect-kde/kcm
l10n daemon script 5ee086271e 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"
2022-11-19 03:08:06 +00:00
..
CMakeLists.txt Adapt build system to also support Qt 6 2022-10-29 16:51:41 +02:00
kcm.cpp Add and make use of ECM's clang-format integration 2022-09-11 23:21:58 +00:00
kcm.h Add and make use of ECM's clang-format integration 2022-09-11 23:21:58 +00:00
kcm.ui Port from KPluginSelector to new KPluginWidget class 2021-12-15 08:24:22 +01:00
kcm_kdeconnect.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-11-19 03:08:06 +00:00
Messages.sh i18n 2013-09-04 21:19:02 +02:00