Merge lp://staging/~indicator-applet-developers/libappindicator/ubuntu into lp://staging/~ubuntu-desktop/libappindicator/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 274 | ||||||||||||||||
| Proposed branch: | lp://staging/~indicator-applet-developers/libappindicator/ubuntu | ||||||||||||||||
| Merge into: | lp://staging/~ubuntu-desktop/libappindicator/ubuntu | ||||||||||||||||
| Diff against target: |
17235 lines (+6462/-3698) 43 files modified
AUTHORS (+1/-0) ChangeLog (+36/-0) Makefile.in (+5/-1) aclocal.m4 (+0/-99) bindings/Makefile.in (+5/-1) bindings/mono/Makefile.in (+5/-1) bindings/mono/examples/Makefile.in (+5/-1) bindings/python/Makefile.in (+5/-1) bindings/vala/Makefile.am (+5/-1) bindings/vala/Makefile.in (+10/-2) bindings/vala/appindicator-0.1-custom.vala (+31/-0) bindings/vala/examples/Makefile.in (+5/-1) bindings/vala/examples/indicator-example.vala (+1/-0) config.guess (+120/-105) config.sub (+101/-55) configure (+1714/-810) configure.ac (+2/-2) debian/changelog (+9/-0) docs/Makefile.in (+5/-1) docs/reference/Makefile.in (+5/-1) docs/reference/html/annotation-glossary.html (+2/-2) docs/reference/html/api-index-deprecated.html (+2/-2) docs/reference/html/api-index-full.html (+2/-2) docs/reference/html/ch01.html (+3/-3) docs/reference/html/index.html (+3/-3) docs/reference/html/libappindicator-app-indicator.html (+29/-37) docs/reference/html/libappindicator.devhelp (+0/-80) docs/reference/html/object-tree.html (+2/-2) docs/reference/libappindicator-docs.sgml (+1/-1) docs/reference/tmpl/app-indicator.sgml (+2/-0) docs/reference/version.xml (+1/-1) docs/reference/xml/app-indicator.xml (+27/-35) example/Makefile.in (+5/-1) example/simple-client-vala.c (+329/-203) gtk-doc.make (+71/-55) ltmain.sh (+2619/-1390) m4/gtk-doc.m4 (+6/-0) m4/libtool.m4 (+1256/-782) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+9/-3) src/Makefile.in (+5/-1) tests/Makefile.in (+5/-1) |
||||||||||||||||
| To merge this branch: | bzr merge lp://staging/~indicator-applet-developers/libappindicator/ubuntu | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-09-28.
Description of the change
VAPI fix, with a brown paper bag thrown in for fun :-/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
