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	Remove characters from UUID that aren't legal in URLs	2018-08-01 11:10:14 +02:00
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	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
runcommandplugin.cpp	Use K_PLUGIN_CLASS_WITH_JSON	2019-06-12 22:16:54 +02:00
runcommandplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00