Merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu into lp://qastaging/~ubuntu-desktop/libindicator/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merge reported by: | Didier Roche-Tolomelli | ||||||||||||||||||||||||||||
| 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: |
3919 lines (+3636/-23) 15 files modified
AUTHORS (+11/-2) ChangeLog (+3479/-0) Makefile.am (+26/-0) Makefile.in (+31/-2) configure (+10/-10) configure.ac (+2/-2) debian/changelog (+14/-1) debian/control (+3/-2) debian/rules (+0/-1) libindicator/Makefile.am (+5/-0) libindicator/Makefile.in (+7/-2) libindicator/indicator-object.c (+25/-0) libindicator/indicator-object.h (+9/-0) libindicator/indicator.pc.in (+1/-1) tools/indicator-loader.c (+13/-0) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Pending | ||
|
Review via email:
|
|||
Description of the change
* 0.3.14
To post a comment you must log in.
Revision history for this message
| Didier Roche-Tolomelli (didrocks) wrote | # |
Revision history for this message
| Didier Roche-Tolomelli (didrocks) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
merging with reverting
Conflicts: libindicator0
as discussed with the release team