lp://qastaging/~schumski-deactivatedaccount-deactivatedaccount/k3b/master
- Get this branch:
- bzr branch lp://qastaging/~schumski-deactivatedaccount-deactivatedaccount/k3b/master
Branch merges
Import details
This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/multimedia/k3b.
Last successful import was .
Recent revisions
- 6071. By Luca Beltrame <email address hidden>
-
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. - 6070. 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" - 6068. 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" - 6066. By Christoph Feck <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit a4bbd2308cf33b9
ab8d91e9d292d83 234ec2e24e) - 6065. 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" - 6062. By Christoph Feck <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit 10d4e56e612b35c
fc4e757f9ff8317 12dd31f3d8)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)