Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream into lp://qastaging/~ubuntu-desktop/indicator-messages/ubuntu
Proposed by
Ted Gould
| Status: | Merged | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 211 | ||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream | ||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/~ubuntu-desktop/indicator-messages/ubuntu | ||||||||||||||||||||||||||||
| Diff against target: |
20646 lines (+9906/-8824) 44 files modified
AUTHORS (+3/-0) ChangeLog (+84/-0) Makefile.am (+36/-0) Makefile.in (+62/-15) aclocal.m4 (+10/-8641) configure (+407/-82) configure.ac (+16/-5) data/Makefile.in (+12/-1) data/icons/16x16/Makefile.in (+12/-1) data/icons/16x16/categories/Makefile.in (+12/-1) data/icons/16x16/status/Makefile.in (+12/-1) data/icons/22x22/Makefile.in (+12/-1) data/icons/22x22/categories/Makefile.in (+12/-1) data/icons/22x22/status/Makefile.in (+12/-1) data/icons/24x24/Makefile.in (+12/-1) data/icons/24x24/status/Makefile.in (+12/-1) data/icons/32x32/Makefile.in (+12/-1) data/icons/32x32/categories/Makefile.in (+12/-1) data/icons/32x32/status/Makefile.in (+12/-1) data/icons/48x48/Makefile.in (+12/-1) data/icons/48x48/status/Makefile.in (+12/-1) data/icons/Makefile.in (+12/-1) data/icons/scalable/Makefile.in (+12/-1) data/icons/scalable/categories/Makefile.in (+12/-1) data/icons/scalable/status/Makefile.in (+12/-1) debian/changelog (+15/-0) debian/control (+6/-6) ltmain.sh (+57/-38) m4/gcov.m4 (+83/-0) m4/intltool.m4 (+216/-0) m4/libtool.m4 (+8001/-0) m4/ltoptions.m4 (+384/-0) m4/ltsugar.m4 (+123/-0) m4/ltversion.m4 (+23/-0) m4/lt~obsolete.m4 (+98/-0) po/Makefile.in.in (+2/-2) src/Makefile.am (+8/-1) src/Makefile.in (+23/-4) src/indicator-messages.c (+15/-5) src/launcher-menu-item.c (+4/-1) src/messages-service.c (+11/-3) src/status-provider-mc5-marshal.c (+1/-1) src/status-provider-pidgin-marshal.c (+1/-1) src/status-provider-telepathy-marshal.c (+1/-1) |
||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream | ||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
Description of the change
0.5.90
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
