l10n daemon script be1d43b42d 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-04-09 03:59:36 +02: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	2017-04-09 03:59:36 +02:00
mprisremoteplugin.cpp	Reduce API exposed through dbus	2017-01-10 18:15:01 +01:00
mprisremoteplugin.h	Reduce API exposed through dbus	2017-01-10 18:15:01 +01:00