l10n daemon script b4e008847a 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-25 04:58:17 +01:00
..
CMakeLists.txt	First implementation of runcommand plugin	2015-09-12 03:38:44 -07:00
kdeconnect_runcommand.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
runcommand_config.cpp	Sort commands by name, as we do on Android	2016-09-30 12:56:27 +02:00
runcommand_config.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
runcommandplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
runcommandplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00