lp:~neon/parley/master
- Get this branch:
- bzr branch lp:~neon/parley/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/parley.
Last successful import was .
Recent revisions
- 3398. By Heiko Becker <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit d6d00446bdc1f78
bf055331cc714cf 9cd9651f38) - 3397. By Heiko Becker <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit 4c6caaac95fc6f6
471156a133b3061 ac4249a405) - 3396. 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" - 3395. By Christoph Feck <email address hidden>
-
GIT_SILENT Update Appstream for new release
(cherry picked from commit d1f68cdb595a0f0
b5468a2a38268c4 853fd02416) - 3394. By Alexander Lohnau <email address hidden>
-
Port away from KNS::DownloadDialog
The newly introduced class wraps the QML components.
This way we do not need to use the about to be deprecated
QWidgets components and have a visually more pleasing dialog. - 3393. 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" - 3392. By Laurent Montel <email address hidden>
-
Don't include QtTest as it includes all QtCore includes
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)