kdeconnect-desktop:release/20.04

Last commit made on 2020-07-12
Get this branch:
git clone -b release/20.04 https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
release/20.04
Repository:
lp:kdeconnect-desktop

Recent commits

f4a6600... by l10n daemon script <email address hidden>

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"

a134948... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

3d07a1e... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

bc5863f... by Nicolas Fella <email address hidden>

Add explanatory comment

b699372... by Fabian Vogt <email address hidden>

Prefer qdbus-qt5 if found

On some distros, this is how qdbus is called to allow for coinstallability
with Qt 4 and Qt 6+.

373557c... by l10n daemon script <email address hidden>

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"

dbc476e... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

5fe8d7e... by l10n daemon script <email address hidden>

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"

d48849d... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

ee34142... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)