l10n daemon script 0d217c58e1 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-05-27 04:22:53 +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	2017-05-27 04:22:53 +02:00
remotecontrolplugin.cpp	Reduce API exposed through dbus	2017-01-10 18:15:01 +01:00
remotecontrolplugin.h	Reduce API exposed through dbus	2017-01-10 18:15:01 +01:00