l10n daemon script d813fefbf7 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"		2018-03-13 05:16:27 +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	2018-03-13 05:16:27 +01:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-13 05:16:27 +01:00
runcommand_config.cpp	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
runcommand_config.h	Make member variable names, & placement and * placement more coherent	2017-09-03 21:45:08 +02:00
runcommandplugin.cpp	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00
runcommandplugin.h	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00