l10n daemon script b4e008847a 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-11-25 04:58:17 +01:00
..
CMakeLists.txt	Move the generation of dbus interfaces into interfaces/	2015-06-18 19:06:14 +02:00
kdeconnect_mprisremote.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-25 04:58:17 +01:00
mprisremoteplugin.cpp	Introduce QVariantMap as an argument of NetworkPackage	2016-06-21 20:07:12 +02:00
mprisremoteplugin.h	Clean up use of virtual and override keywords	2016-06-20 19:22:29 +02:00