Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicate/upstream into lp://qastaging/~ubuntu-desktop/libindicate/ubuntu
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 304 |
Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicate/upstream |
Merge into: | lp://qastaging/~ubuntu-desktop/libindicate/ubuntu |
Diff against target: |
9083 lines (+5871/-774) 53 files modified
AUTHORS (+1/-0) ChangeLog (+12/-0) INSTALL (+7/-2) Makefile.in (+58/-36) aclocal.m4 (+89/-37) autogen.sh (+1/-1) bindings/Makefile.in (+16/-11) bindings/mono/Makefile.in (+16/-11) bindings/mono/indicate-gtk/Makefile.am (+2/-2) bindings/mono/indicate-gtk/Makefile.in (+33/-22) bindings/mono/indicate-gtk/indicate-gtk.sources.xml.in (+2/-2) bindings/mono/indicate/Makefile.am (+2/-2) bindings/mono/indicate/Makefile.in (+32/-22) bindings/mono/indicate/indicate.sources.xml.in (+6/-6) bindings/python/Makefile.in (+45/-41) compile (+183/-16) config.guess (+31/-18) config.sub (+39/-26) configure (+81/-19) configure.ac (+4/-2) debian/changelog (+7/-0) depcomp (+66/-8) docs/Makefile.in (+16/-11) docs/reference/Makefile.in (+17/-11) docs/reference/html/IndicateIndicator.html (+594/-0) docs/reference/html/IndicateListener.html (+462/-0) docs/reference/html/IndicateServer.html (+882/-0) docs/reference/html/base.html (+41/-0) docs/reference/html/index.html (+41/-0) docs/reference/html/index.sgml (+85/-0) docs/reference/html/ix01.html (+154/-0) docs/reference/html/libindicate.devhelp2 (+79/-0) docs/reference/html/listeners.html (+36/-0) docs/reference/html/style.css (+266/-0) docs/reference/html/subclass.html (+31/-0) docs/reference/tmpl/indicator.sgml (+178/-0) docs/reference/tmpl/listener.sgml (+173/-0) docs/reference/tmpl/server.sgml (+263/-0) docs/reference/version.xml (+1/-1) docs/reference/xml/annotation-glossary.xml (+45/-0) docs/reference/xml/api-index-deprecated.xml (+5/-0) docs/reference/xml/api-index-full.xml (+71/-0) docs/reference/xml/indicator.xml (+401/-0) docs/reference/xml/listener.xml (+318/-0) docs/reference/xml/server.xml (+600/-0) examples/Makefile.in (+60/-64) install-sh (+18/-11) libindicate-gtk/Makefile.in (+50/-58) libindicate/Makefile.am (+2/-2) libindicate/Makefile.in (+57/-65) missing (+4/-49) py-compile (+33/-18) tests/Makefile.in (+155/-200) |
To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libindicate/upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Pending | ||
Ken VanDine | Pending | ||
Review via email: mp+96847@code.qastaging.launchpad.net |
Description of the change
0.6.91
To post a comment you must log in.