l10n daemon script 6879cf14cd 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"		2018-10-24 05:55:51 +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	2018-10-24 05:55:51 +02:00
kdeconnect_runcommand_config.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:19:16 +02:00
runcommand_config.cpp	Remove characters from UUID that aren't legal in URLs	2018-08-01 11:10:14 +02:00
runcommand_config.h	Introduce a Run command preset menu in the run command kcm	2018-03-24 20:19:12 +01:00
runcommandplugin.cpp	Do not require Frameworks 5.45	2018-05-10 19:48:40 +02:00
runcommandplugin.h	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00