l10n daemon script 5795e27191 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"		2015-09-10 11:33:23 +00: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	2015-09-10 11:33:23 +00:00
mprisremoteplugin.cpp	Implement an MPRIS client plugin	2015-06-18 04:01:01 +02:00
mprisremoteplugin.h	Implement an MPRIS client plugin	2015-06-18 04:01:01 +02:00