Merge lp://staging/~brian-murray/ubuntu/oneiric/apport/ubiquity-and-overrides into lp://staging/~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Proposed by
Brian Murray
| Status: | Merged |
|---|---|
| Merged at revision: | 1805 |
| Proposed branch: | lp://staging/~brian-murray/ubuntu/oneiric/apport/ubiquity-and-overrides |
| Merge into: | lp://staging/~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu |
| Diff against target: |
117 lines (+53/-7) (has conflicts) 4 files modified
apport/hookutils.py (+29/-1) data/general-hooks/ubuntu.py (+8/-2) data/package-hooks/source_ubiquity.py (+2/-4) debian/changelog (+14/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~brian-murray/ubuntu/oneiric/apport/ubiquity-and-overrides |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
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
Committed with a few small code cleanups, thanks!