l10n daemon script e1618b1ad8 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-03-24 05:23:24 +01: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-03-24 05:23:24 +01:00
mprisremoteplayer.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
mprisremoteplayer.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
mprisremoteplugin.cpp	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00
mprisremoteplugin.h	Replace http GNU urls with https	2019-03-23 17:29:26 +01:00