Merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/simple-scan/maverick-201009271612 into lp://qastaging/ubuntu/maverick/simple-scan
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/maverick/simple-scan/maverick-201009271612 |
| Merge into: | lp://qastaging/ubuntu/maverick/simple-scan |
| Diff against target: |
168 lines (+145/-0) (has conflicts) 2 files modified
.pc/01-zlib.patch/configure.ac (+72/-0) .pc/20-lpi.patch/configure.ac (+73/-0) Text conflict in .pc/01-zlib.patch/configure.ac Text conflict in .pc/20-lpi.patch/configure.ac |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/maverick/simple-scan/maverick-201009271612 |
| Related bugs: |
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/maverick/simple-scan now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/simple-scan/maverick-201009271612. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 33. By Michael Terry
-
New upstream release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
