l10n daemon script 69985f6d0c 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-04-09 05:10:22 +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	2017-04-09 05:10:22 +02:00
remotecommandsplugin.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
remotecommandsplugin.h	Remote Commands plugin	2016-06-12 20:16:58 +02:00