Merge lp://staging/~sylvain-pineau/checkbox/0.15 into lp://staging/checkbox

Proposed by Sylvain Pineau
Status: Merged
Merged at revision: 1876
Proposed branch: lp://staging/~sylvain-pineau/checkbox/0.15
Merge into: lp://staging/checkbox
Diff against target: 1477 lines (+506/-529) (has conflicts)
1 file modified
debian/changelog (+506/-529)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~sylvain-pineau/checkbox/0.15
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+142593@code.staging.launchpad.net

Description of the change

This MR basically offers a common ancestry for the ubuntu branch of checkbox.

The changelog comes from the ubuntu version, recent bugs/features have been added under 0.15 in addition to bugs/features that were omitted due to Feature/UI Freezes. It means entries in the changelog from 0.14.5 and onwards.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Merged, thanks for the great work on this! now we have the long-coveted common history between lp:checkbox and lp:ubuntu/checkbox.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches