l10n daemon script 2d2cf7444a 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"		2019-08-07 05:00:07 +02:00
..
CMakeLists.txt	[plugins/mprisremote] Don't link against KI18n	2019-03-11 19:09:00 +01:00
kdeconnect_mprisremote.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:00:07 +02:00
mprisremoteplayer.cpp	Adds the missing KDE Connect MPRIS properties on desktop receive-side	2019-07-19 20:08:56 +00:00
mprisremoteplayer.h	Adds the missing KDE Connect MPRIS properties on desktop receive-side	2019-07-19 20:08:56 +00:00
mprisremoteplugin.cpp	[app/mpris] Support non-seekable players	2019-07-17 21:19:53 +00:00
mprisremoteplugin.h	[app/mpris] Support non-seekable players	2019-07-17 21:19:53 +00:00