kdeconnect-kde/plugins/mprisremote
l10n daemon script cd1d047a3c 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"
2021-02-15 07:07:57 +01:00
..
CMakeLists.txt Use ecm_qt_declare_logging_category to declare the logging categories 2020-05-26 18:55:47 +02:00
kdeconnect_mprisremote.json SVN_SILENT made messages (.desktop file) - always resolve ours 2021-02-15 07:07:57 +01:00
mprisremoteplayer.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayer.h Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2.h Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2player.cpp Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00:00
mprisremoteplayermediaplayer2player.h Convert license headers to SPDX expressions 2020-08-17 09:48:10 +00: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