kdeconnect-desktop:1.3

Last commit made on 2019-12-02
Get this branch:
git clone -b 1.3 https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
1.3
Repository:
lp:kdeconnect-desktop

Recent commits

7f37d79... by l10n daemon script <email address hidden> on 2019-12-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"

8525f07... by l10n daemon script <email address hidden> on 2019-11-30

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"

6833ce1... by l10n daemon script <email address hidden> on 2019-11-20

GIT_SILENT made messages (after extraction)

be74067... by l10n daemon script <email address hidden> on 2019-11-17

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"

dc6ed38... by l10n daemon script <email address hidden> on 2019-11-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"

015672d... by l10n daemon script <email address hidden> on 2019-10-28

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"

2981840... by l10n daemon script <email address hidden> on 2019-10-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"

da87b88... by l10n daemon script <email address hidden> on 2019-09-30

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"

75e432b... by l10n daemon script <email address hidden> on 2019-09-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"

8d4db31... by l10n daemon script <email address hidden> on 2019-09-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"