Merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu into lp://qastaging/~ubuntu-desktop/libindicator/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 345 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/~ubuntu-desktop/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Diff against target: |
2439 lines (+896/-412) 26 files modified
AUTHORS (+1/-0) ChangeLog (+172/-0) aclocal.m4 (+2/-2) configure (+28/-47) configure.ac (+4/-7) debian/changelog (+12/-0) debian/control (+6/-7) debian/libindicator-tools.install (+0/-1) debian/libindicator3-dev.install (+1/-0) libindicator/Makefile.am (+13/-15) libindicator/Makefile.in (+36/-17) libindicator/gen-indicator-service.xml.c (+23/-0) libindicator/gen-indicator-service.xml.h (+1/-0) libindicator/indicator-object-marshal.c (+37/-0) libindicator/indicator-object-marshal.h (+8/-0) libindicator/indicator-object-marshal.list (+1/-0) libindicator/indicator-object.c (+64/-0) libindicator/indicator-object.h (+14/-0) libindicator/indicator-service-manager.c (+178/-124) libindicator/indicator-service.c (+194/-151) libindicator/indicator3.pc.in (+1/-1) libindicator3-1.install (+0/-1) tests/Makefile.am (+22/-11) tests/Makefile.in (+33/-25) tests/test-desktop-shortcuts.c (+1/-0) tools/Makefile.in (+44/-3) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Pending | ||
|
Review via email:
|
|||
Description of the change
Woot!
To post a comment you must log in.
Revision history for this message
| Ted Gould (ted) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Oh, make sure to grab Ken's branch on this one as well. I believe he has the Breaks in it.