kdeconnect-kde/plugins/remotecontrol
l10n daemon script aa1dff34ae 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"
2017-01-25 05:55:10 +01: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 2017-01-25 05:55:10 +01:00
remotecontrolplugin.cpp Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00
remotecontrolplugin.h Reduce API exposed through dbus 2017-01-10 18:15:01 +01:00