l10n daemon script e40312bf5e 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"		2018-06-18 05:27:46 +02:00
..
CMakeLists.txt	Support multiple players in MprisRemote	2018-04-28 00:22:58 +02:00
kdeconnect_mprisremote.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 05:27:46 +02:00
mprisremoteplayer.cpp	Support multiple players in MprisRemote	2018-04-28 00:22:58 +02:00
mprisremoteplayer.h	Support multiple players in MprisRemote	2018-04-28 00:22:58 +02:00
mprisremoteplugin.cpp	Request status when connecting	2018-04-28 00:23:52 +02:00
mprisremoteplugin.h	Fix DBus signals in Mprisremote	2018-06-10 01:07:40 +02:00