kdeconnect-kde/plugins/mprisremote
l10n daemon script 3f42e61b1d 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"
2022-07-02 02:00:21 +00:00
..
CMakeLists.txt Clean up unneeded JSON parameter in kcoreaddons_add_plugin 2021-06-28 20:33:52 +02:00
kdeconnect_mprisremote.json SVN_SILENT made messages (.desktop file) - always resolve ours 2022-07-02 02:00:21 +00:00
mprisremoteplayer.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayer.h GIT_SILENT: add missing override 2021-10-27 06:53:06 +02:00
mprisremoteplayermediaplayer2.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2.h GIT_SILENT: add missing override 2021-10-27 06:53:06 +02:00
mprisremoteplayermediaplayer2player.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2player.h GIT_SILENT: add missing override 2021-10-27 06:53:06 +02:00
mprisremoteplugin.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplugin.h Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00