l10n daemon script a43bb1bdbb 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"		2016-11-05 09:58:11 +00: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	2016-11-05 09:58:11 +00:00
remotecommandsplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
remotecommandsplugin.h	Remote Commands plugin	2016-06-12 20:16:58 +02:00