~trebelnik-stefina/cinnamon-test/+git/k3b:release/20.04

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

2bb08d4... by l10n daemon script <email address hidden> on 2020-07-12

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"

9f7635b... by l10n daemon script <email address hidden> on 2020-07-12

GIT_SILENT made messages (after extraction)

81f5da2... by Christoph Feck <email address hidden> on 2020-07-03

GIT_SILENT Update Appstream for new release

90cb48c... by Christoph Feck <email address hidden> on 2020-07-03

GIT_SILENT Upgrade release service version to 20.04.3.

564e54e... by Luca Beltrame <email address hidden> on 2020-06-19

Fix CMake module search

The local cmake modules should, in this case, be preferred compared to
the ones in ECM, or the build will not be probably configured,
causing includes not to be found, and thus ending up in failure.

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

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"

8b63528... by l10n daemon script <email address hidden> on 2020-06-18

GIT_SILENT made messages (after extraction)

e85c0aa... by l10n daemon script <email address hidden> on 2020-06-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"

5979ca1... by l10n daemon script <email address hidden> on 2020-06-17

GIT_SILENT made messages (after extraction)

a4bbd23... by Christoph Feck <email address hidden> on 2020-06-08

GIT_SILENT Update Appstream for new release