l10n daemon script e40312bf5e 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-06-18 05:27:46 +02:00
..
CMakeLists.txt	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00
kdeconnect_remotecontrol.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:27:46 +02:00
remotecontrolplugin.cpp	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00
remotecontrolplugin.h	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00