l10n daemon script e6a7df25aa 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"		2016-12-20 12:45:03 +01: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	2016-12-20 12:45:03 +01:00
mprisremoteplugin.cpp	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00
mprisremoteplugin.h	Clazy says all this QStringLiteral and QLatin1String were missing/wrong	2016-11-26 16:21:29 +01:00