l10n daemon script 8f14a64170 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-09-05 09:04:32 +02:00
..
CMakeLists.txt	Move the generation of dbus interfaces into interfaces/	2015-06-18 19:06:14 +02:00
kdeconnect_mprisremote.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-05 09:04:32 +02:00
mprisremoteplugin.cpp	Rename NetworkPackage -> NetworkPacket	2018-03-05 20:03:23 +01:00
mprisremoteplugin.h	Fix DBus signals in Mprisremote	2018-09-06 18:19:24 +02:00