Merge lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam into lp://qastaging/ubuntu/oneiric/xfe
Proposed by
Mat Scales
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | Martin Pitt | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam | ||||
| Merge into: | lp://qastaging/ubuntu/oneiric/xfe | ||||
| Diff against target: |
334 lines (+305/-0) (has conflicts) 3 files modified
.pc/11_ld-as-needed.patch/configure.ac (+253/-0) debian/changelog (+10/-0) debian/patches/11_ld-as-needed.patch (+42/-0) Conflict adding file .pc/11_ld-as-needed.patch. Moved existing file to .pc/11_ld-as-needed.patch.moved. Text conflict in debian/changelog Conflict adding file debian/patches/11_ld-as-needed.patch. Moved existing file to debian/patches/11_ld-as-needed.patch.moved. |
||||
| To merge this branch: | bzr merge lp://qastaging/~wibblymat/ubuntu/oneiric/xfe/ftbfs-jam | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
I had the wrong bug number in debian/changelog so it hasn't auto closed.
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
