l10n daemon script eb5c099661 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"		2015-07-22 10:07:40 +00: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	2015-07-22 10:07:40 +00:00
remotecontrolplugin.cpp	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00
remotecontrolplugin.h	Implement the touchpad forwarding into kcapp	2015-07-22 03:21:28 +02:00