l10n daemon script e6a7df25aa 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"		2016-12-20 12:45:03 +01: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	2016-12-20 12:45:03 +01:00
remotecontrolplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
remotecontrolplugin.h	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00