lp:~neon/dragon/master
- Get this branch:
- bzr branch lp:~neon/dragon/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/multimedia/dragon.
Last successful import was .
Recent revisions
- 1231. By Heiko Becker <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit 64bab4de74f5f6b
7799ef78dc4e371 5db9a9a4bf) - 1225. 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" - 1224. By Heiko Becker <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit 450e965387cdc85
4f1cf09bbb3f129 a8e2ac830f) - 1222. 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"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)