master : lp:~rikmills/+git/kdeconnect-upstream : Git : Code : Rik Mills

Get this branch:: git clone -b master https://git.launchpad.net/~rikmills/+git/kdeconnect-upstream

You will only be able to propose a merge to another personal repository with the same name.

Branch information

f7c27e6... by l10n daemon script <email address hidden> on 2020-06-08

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"

6f39937... by l10n daemon script <email address hidden> on 2020-06-07

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"

[SMS App] Stop ChatMessage.qml from rendering HTML

e338309... by l10n daemon script <email address hidden> on 2020-06-06

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"

8eee929... by l10n daemon script <email address hidden> on 2020-06-05

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"

f31dc37... by l10n daemon script <email address hidden> on 2020-06-04

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"

2e5a62c... by l10n daemon script <email address hidden> on 2020-06-03

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"

84072ff... by l10n daemon script <email address hidden> on 2020-06-02

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"

7806fe7... by l10n daemon script <email address hidden> on 2020-06-01

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"

4c01145... by Jun Bo Bi <email address hidden> on 2020-05-29

Add real support for mpriscontrol on Windows

»