Merge lp://qastaging/~glatzor/software-center/force-bad-quality into lp://qastaging/software-center

Proposed by Sebastian Heinlein
Status: Merged
Merged at revision: 1710
Proposed branch: lp://qastaging/~glatzor/software-center/force-bad-quality
Merge into: lp://qastaging/software-center
Diff against target: 117 lines (+38/-7) (has conflicts)
2 files modified
softwarecenter/backend/aptd.py (+31/-4)
softwarecenter/view/dialogs.py (+7/-3)
Text conflict in softwarecenter/backend/aptd.py
To merge this branch: bzr merge lp://qastaging/~glatzor/software-center/force-bad-quality
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+57669@code.qastaging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.