Merge lp://staging/~indicator-applet-developers/libindicate/ubuntu into lp://staging/~ubuntu-desktop/libindicate/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: 297
Proposed branch: lp://staging/~indicator-applet-developers/libindicate/ubuntu
Merge into: lp://staging/~ubuntu-desktop/libindicate/ubuntu
Diff against target: 20244 lines (+9654/-9078)
48 files modified
AUTHORS (+4/-0)
ChangeLog (+128/-0)
Makefile.am (+11/-2)
Makefile.in (+14/-4)
aclocal.m4 (+48/-8661)
bindings/Makefile.am (+9/-1)
bindings/Makefile.in (+11/-3)
bindings/mono/Makefile.in (+7/-1)
bindings/mono/indicate-gtk/Makefile.in (+7/-1)
bindings/mono/indicate/Makefile.in (+7/-1)
bindings/mono/indicate/indicate-api.raw (+10/-0)
bindings/python/Makefile.in (+7/-1)
configure (+421/-94)
configure.ac (+84/-29)
debian/changelog (+11/-0)
debian/patches/lp_690668.patch (+0/-28)
docs/Makefile.in (+7/-1)
docs/reference/Makefile.in (+7/-1)
docs/reference/html/IndicateIndicator.html (+4/-4)
docs/reference/html/IndicateListener.html (+4/-4)
docs/reference/html/IndicateServer.html (+2/-2)
docs/reference/html/base.html (+2/-2)
docs/reference/html/index.html (+2/-2)
docs/reference/html/ix01.html (+3/-3)
docs/reference/html/libindicate.devhelp (+0/-77)
docs/reference/html/listeners.html (+2/-2)
docs/reference/html/subclass.html (+2/-2)
docs/reference/tmpl/indicator.sgml (+0/-2)
docs/reference/tmpl/listener.sgml (+0/-2)
docs/reference/tmpl/server.sgml (+0/-2)
docs/reference/version.xml (+1/-1)
docs/reference/xml/indicator.xml (+2/-2)
docs/reference/xml/listener.xml (+2/-2)
examples/Makefile.am (+11/-9)
examples/Makefile.in (+49/-74)
gtk-doc.make (+71/-55)
libindicate-gtk/Makefile.in (+7/-1)
libindicate/Makefile.in (+7/-1)
libindicate/listener.c (+2/-0)
m4/gnome-doc-utils.m4 (+56/-0)
m4/gtk-doc.m4 (+67/-0)
m4/introspection.m4 (+94/-0)
m4/libtool.m4 (+7851/-0)
m4/ltoptions.m4 (+369/-0)
m4/ltsugar.m4 (+123/-0)
m4/ltversion.m4 (+23/-0)
m4/lt~obsolete.m4 (+98/-0)
tests/Makefile.in (+7/-1)
To merge this branch: bzr merge lp://staging/~indicator-applet-developers/libindicate/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Sebastien Bacher Pending
Review via email: mp+76143@code.staging.launchpad.net

Description of the change

Mostly build fixed and a small mem leak

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good!

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: