lp:~neon/marble/master
- Get this branch:
- bzr branch lp:~neon/marble/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/education/marble.
Last successful import was .
Recent revisions
- 12192. 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" - 12191. 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" - 12190. 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" - 12188. By Antonio Rojas <email address hidden>
-
Fix build with Qt 5.15
Differential Revision: https:/
/phabricator. kde.org/ D28171
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)