l10n daemon script 201be5d898 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"		2020-03-16 10:21:09 +01:00
..
CMakeLists.txt	Make plugins work in SailfishConnect	2020-03-01 20:00:40 +00:00
kdeconnect_runcommand.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-12-25 05:45:20 +01:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-16 10:21:09 +01: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	Make plugins work in SailfishConnect	2020-03-01 20:00:40 +00:00
runcommandplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00