Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libappindicator/upstream into lp://qastaging/~ubuntu-desktop/libappindicator/ubuntu
Proposed by
Ted Gould
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 287 | ||||||||||||||||||||
Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/libappindicator/upstream | ||||||||||||||||||||
Merge into: | lp://qastaging/~ubuntu-desktop/libappindicator/ubuntu | ||||||||||||||||||||
Diff against target: |
4149 lines (+1205/-689) 45 files modified
AUTHORS (+1/-0) ChangeLog (+65/-0) INSTALL (+7/-2) Makefile.in (+58/-35) aclocal.m4 (+82/-30) bindings/Makefile.in (+16/-11) bindings/mono/Makefile.am (+3/-3) bindings/mono/Makefile.in (+31/-21) bindings/mono/app-indicator.sources.xml.in (+4/-4) bindings/mono/examples/Makefile.in (+16/-11) bindings/python/Makefile.am (+4/-5) bindings/python/Makefile.in (+53/-48) bindings/python/appindicator.override.in (+2/-2) bindings/vala/Makefile.in (+23/-14) bindings/vala/examples/Makefile.in (+33/-33) compile (+183/-16) config.guess (+31/-18) config.sub (+39/-26) configure (+52/-18) configure.ac (+4/-2) debian/changelog (+12/-0) depcomp (+66/-8) docs/Makefile.in (+16/-11) docs/reference/Makefile.in (+24/-17) docs/reference/html/api-index-0-5.html (+42/-0) docs/reference/html/api-index-deprecated.html (+2/-2) docs/reference/html/api-index-full.html (+2/-2) docs/reference/html/ch01.html (+1/-1) docs/reference/html/index.html (+2/-1) docs/reference/html/libappindicator-app-indicator.html (+2/-0) docs/reference/html/libappindicator.devhelp2 (+3/-2) docs/reference/libappindicator-docs.sgml (+5/-1) docs/reference/libappindicator-docs.sgml.in (+4/-0) docs/reference/version.xml (+1/-1) docs/reference/xml/api-index-0.5.xml (+12/-0) docs/reference/xml/app-indicator.xml (+6/-6) example/Makefile.in (+38/-40) example/simple-client-vala.c (+1/-1) install-sh (+18/-11) missing (+4/-49) py-compile (+33/-18) src/Makefile.in (+66/-79) src/app-indicator.c (+56/-44) tests/Makefile.in (+75/-88) tests/test-libappindicator.desktop (+7/-8) |
||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/libappindicator/upstream | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Pending | ||
Ken VanDine | Pending | ||
Review via email: mp+96805@code.qastaging.launchpad.net |
Description of the change
0.4.91
To post a comment you must log in.