Merge lp://staging/~ris/ubuntu/natty/empathy/fix-538963 into lp://staging/ubuntu/natty/empathy

Proposed by Robert Sajdok
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp://staging/~ris/ubuntu/natty/empathy/fix-538963
Merge into: lp://staging/ubuntu/natty/empathy
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
src/empathy-main-window.c (+1/-0)
To merge this branch: bzr merge lp://staging/~ris/ubuntu/natty/empathy/fix-538963
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Review via email: mp+51471@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for your patch! It has been accepted upstream, and thus we'll get it once upstream pushes out the next release.

Closing this merge proposal, because it's against the wrong branch (we use lp:~ubuntu-desktop/empathy/ubuntu, see Vcs-Bzr: header), it uses an inline patch instead of a separate debian/patches/ patch header, and we don't need to cherrypick it now as we'll get the next upstream release into natty. Thanks!

review: Disapprove

Unmerged revisions

140. By Robert Sajdok

src/empathy-main-window.c: fixed: "reducing the width of contact list disappears combobox" (LP: #538963)

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