kdeconnect-kde/plugins/remotecommands
l10n daemon script 8f14a64170 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"
2019-09-05 09:04:32 +02:00
..
CMakeLists.txt Remote Commands plugin 2016-06-12 20:16:58 +02:00
kdeconnect_remotecommands.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-05 09:04:32 +02:00
remotecommandsplugin.cpp Rename NetworkPackage -> NetworkPacket 2018-03-05 20:03:23 +01:00
remotecommandsplugin.h Rename NetworkPackage -> NetworkPacket 2018-03-05 20:03:23 +01:00