l10n daemon script fd64a8bcc7 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"		2017-01-06 05:54:14 +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	2016-12-20 12:45:03 +01:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-06 05:54:14 +01:00
runcommand_config.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
runcommand_config.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00
runcommandplugin.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
runcommandplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00