kdeconnect-kde/plugins/runcommand
l10n daemon script 0856c297c1 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"
2019-09-29 05:09:20 +02:00
..
CMakeLists.txt
kdeconnect_runcommand.json SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-29 05:09:20 +02:00
kdeconnect_runcommand_config.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-29 05:09:20 +02:00
runcommand_config.cpp Rename DbusHelper => DBusHelper 2019-08-14 17:36:19 +02:00
runcommand_config.h
runcommandplugin.cpp
runcommandplugin.h