Merge lp://qastaging/~roadmr/ubuntu/oneiric/checkbox/0.12.10 into lp://qastaging/ubuntu/oneiric-proposed/checkbox
Proposed by
Daniel Manrique
| Status: | Merged |
|---|---|
| Merge reported by: | Mathieu Trudel-Lapierre |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~roadmr/ubuntu/oneiric/checkbox/0.12.10 |
| Merge into: | lp://qastaging/ubuntu/oneiric-proposed/checkbox |
| Diff against target: |
55 lines (+18/-3) 3 files modified
debian/changelog (+11/-0) jobs/bluetooth.txt.in (+6/-2) scripts/connect_wireless (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~roadmr/ubuntu/oneiric/checkbox/0.12.10 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mathieu Trudel-Lapierre | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes the code for the two 0.12.9 bugs that failed verification (one was missing code, so I added it; the code for the other didn't fix the bug, so I removed it). I also re-added one dependency that got removed by mistake and updated the changelog to bump the version to 0.12.10.
Merge requested on -proposed directly, with just the changes that need to be applied on top of 0.12.9.
Thanks!
To post a comment you must log in.
Revision history for this message
| Mathieu Trudel-Lapierre (cyphermox) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think this got merged; I'll set the state to merged.