Merge lp://staging/~attente/gtk/gtkmodelmenuitem-icons into lp://staging/~ubuntu-desktop/gtk/ubuntugtk3

Proposed by William Hua
Status: Merged
Merged at revision: 295
Proposed branch: lp://staging/~attente/gtk/gtkmodelmenuitem-icons
Merge into: lp://staging/~ubuntu-desktop/gtk/ubuntugtk3
Diff against target: 104 lines (+91/-1)
2 files modified
debian/patches/git-gtkmodelmenuitem-icon-support.patch (+90/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp://staging/~attente/gtk/gtkmodelmenuitem-icons
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+186961@code.staging.launchpad.net

Commit message

* debian/patches/git-gtkmodelmenuitem-icon-support.patch:
  - git backport from 3.9, add upstream's GtkModelMenuItem GIcon support

Description of the change

GModelMenuItem icons went missing because this patch was dropped. Re-add the patch.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for catching/fixing that one, seems like I've been a bit too agressive cleaning git* when updating to the new upstream version (I assumed that since those were coming from git would be include, I forgot some were from a newer git serie)

I'm adding the changelog entry and uploading to saucy

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

to all changes: