Merge lp:~ubuntu-branches/ubuntu/natty/gcc-defaults-armel-cross/natty-201104151410 into lp:ubuntu/natty/gcc-defaults-armel-cross
Proposed by
James Westby
| Status: | Merged |
|---|---|
| Merged at revision: | 5 |
| Proposed branch: | lp:~ubuntu-branches/ubuntu/natty/gcc-defaults-armel-cross/natty-201104151410 |
| Merge into: | lp:ubuntu/natty/gcc-defaults-armel-cross |
| Diff against target: |
7 lines (+0/-2) 1 file modified
.bzr-builddeb/default.conf (+0/-2) |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/natty/gcc-defaults-armel-cross/natty-201104151410 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson | Approve | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/gcc-defaults-armel-cross now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/gcc-defaults-armel-cross/natty-201104151410. A merge should be performed if necessary.
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 file changes are spurious, but there's more detailed history here, so I'll merge just the history.