l10n daemon script f4a660073b 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"		2020-07-12 09:13:29 +02:00
..
CMakeLists.txt	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00
kdeconnect_remotecontrol.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-12 09:13:29 +02:00
remotecontrolplugin.cpp	Use K_PLUGIN_CLASS_WITH_JSON	2019-06-12 22:16:54 +02:00
remotecontrolplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00