l10n daemon script a0c1a57999 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"		2015-12-30 09:23:05 +00: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	2015-12-30 09:23:05 +00:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-30 10:26:50 +00:00
runcommand_config.cpp	Improve RunCommand configuration display	2015-09-12 13:51:15 +02:00
runcommand_config.h	Fix warnings	2015-11-26 16:19:00 +01:00
runcommandplugin.cpp	Don't lock the daemon when running a process is started	2015-09-12 13:51:15 +02:00
runcommandplugin.h	Made the runcommands plugin re-send the config when it changes	2015-09-12 04:50:20 -07:00