Merge lp://qastaging/~kubuntu-packagers/ubuntu-release-upgrader/qt5 into lp://qastaging/ubuntu-release-upgrader
Proposed by
Harald Sitter
| Status: | Merged |
|---|---|
| Merged at revision: | 2863 |
| Proposed branch: | lp://qastaging/~kubuntu-packagers/ubuntu-release-upgrader/qt5 |
| Merge into: | lp://qastaging/ubuntu-release-upgrader |
| Diff against target: |
2003 lines (+798/-641) (has conflicts) 11 files modified
DistUpgrade/DistUpgradeFetcherKDE.py (+159/-111) DistUpgrade/DistUpgradeViewKDE.py (+59/-66) DistUpgrade/QUrlOpener.py (+80/-0) DistUpgrade/dialog_changes.ui (+107/-133) DistUpgrade/dialog_error.ui (+70/-88) DistUpgrade/dialog_release_notes.ui (+24/-20) DistUpgrade/fetch-progress.ui (+25/-56) DistUpgrade/window_main.ui (+173/-166) debian/changelog (+87/-0) debian/control (+2/-1) do-release-upgrade (+12/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://qastaging/~kubuntu-packagers/ubuntu-release-upgrader/qt5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kubuntu Developers | Pending | ||
| Jonathan Riddell | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Rohan Garg (rohangarg) wrote | # |
Revision history for this message
| Dmitry Shachnev (mitya57) | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Generally looks alright to me.