Merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu into lp://qastaging/~ubuntu-desktop/libindicator/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | not available | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/~ubuntu-desktop/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Diff against target: |
41023 lines (+40546/-246) 33 files modified
.bzr-builddeb/default.conf (+1/-1) .bzrignore (+0/-154) INSTALL (+302/-0) Makefile.in (+739/-0) aclocal.m4 (+9189/-0) autogen.sh (+0/-11) compile (+143/-0) config.guess (+1533/-0) config.h.in (+74/-0) config.sub (+1693/-0) configure (+13993/-0) configure.ac (+2/-2) debian/changelog (+14/-0) depcomp (+630/-0) helper/test-loader-build (+0/-3) helper/test-loader.c (+0/-18) install-sh (+520/-0) libindicator/Makefile.am (+1/-1) libindicator/Makefile.in (+798/-0) libindicator/indicator-desktop-shortcuts.c (+45/-6) libindicator/indicator-object-enum-types.c (+25/-0) libindicator/indicator-object-marshal.c (+126/-0) libindicator/indicator-object-marshal.h (+28/-0) ltmain.sh (+8413/-0) missing (+376/-0) tests/Makefile.am (+1/-1) tests/Makefile.in (+1328/-0) tests/service-manager-connect.service.in (+0/-3) tests/service-version-bad.service.in (+0/-3) tests/service-version-good.service.in (+0/-3) tests/session.conf.in (+0/-40) tests/test-desktop-shortcuts.c (+1/-0) tools/Makefile.in (+571/-0) |
||||||||||||||||||||||||||||
| 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
0.3.8
NOTE: Changing to merge-upstream style.
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
