l10n daemon script ce7b848b40 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-12-25 04:31:15 +00:00
..
CMakeLists.txt	Adapt build system to also support Qt 6	2022-10-29 16:51:41 +02:00
kdeconnect_remotecontrol.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-25 04:31:15 +00:00
remotecontrolplugin.cpp	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00:00
remotecontrolplugin.h	Add and make use of ECM's clang-format integration	2022-09-11 23:21:58 +00:00