l10n daemon script c630a3de90 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"		2021-11-04 01:16:42 +00:00
..
CMakeLists.txt	Clean up unneeded JSON parameter in kcoreaddons_add_plugin	2021-06-28 20:33:52 +02:00
kdeconnect_remotecontrol.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-11-04 01:16:42 +00:00
remotecontrolplugin.cpp	improve mouse lock behaviour and info label text	2021-08-09 03:00:40 +05:30
remotecontrolplugin.h	remotecontrolplugin: fix sendCommand param	2021-07-16 01:49:09 +05:30