kdeconnect-kde/plugins/remotecontrol
l10n daemon script 2ca1d9720e 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"
2015-12-03 09:40:02 +00: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 2015-12-03 09:40:02 +00:00
remotecontrolplugin.cpp Eh... copypaste 2015-08-07 15:02:06 +02:00
remotecontrolplugin.h Eh... copypaste 2015-08-07 15:02:06 +02:00