l10n daemon script ba5e3ab2f8 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-11-27 04:56:48 +01: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	2017-11-27 04:56:48 +01:00
remotecommandsplugin.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
remotecommandsplugin.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00