Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream into lp://qastaging/~ubuntu-desktop/indicator-messages/ubuntu
Proposed by
Charles Kerr
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 228 | ||||||||||||||||||||||||||||
Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-messages/upstream | ||||||||||||||||||||||||||||
Merge into: | lp://qastaging/~ubuntu-desktop/indicator-messages/ubuntu | ||||||||||||||||||||||||||||
Diff against target: |
18550 lines (+9288/-8847) 35 files modified
ChangeLog (+57/-0) INSTALL (+7/-2) Makefile.in (+4/-1) aclocal.m4 (+6/-8821) configure (+5/-1) configure.ac (+1/-1) data/Makefile.in (+4/-1) data/icons/16x16/Makefile.in (+4/-1) data/icons/16x16/categories/Makefile.in (+4/-1) data/icons/16x16/status/Makefile.in (+4/-1) data/icons/22x22/Makefile.in (+4/-1) data/icons/22x22/categories/Makefile.in (+4/-1) data/icons/22x22/status/Makefile.in (+4/-1) data/icons/24x24/Makefile.in (+4/-1) data/icons/24x24/status/Makefile.in (+4/-1) data/icons/32x32/Makefile.in (+4/-1) data/icons/32x32/categories/Makefile.in (+4/-1) data/icons/32x32/status/Makefile.in (+4/-1) data/icons/48x48/Makefile.in (+4/-1) data/icons/48x48/status/Makefile.in (+4/-1) data/icons/Makefile.in (+4/-1) data/icons/scalable/Makefile.in (+4/-1) data/icons/scalable/categories/Makefile.in (+4/-1) data/icons/scalable/status/Makefile.in (+4/-1) debian/changelog (+8/-0) m4/intltool.m4 (+237/-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) src/Makefile.in (+4/-1) src/messages-service-dbus.c (+205/-0) src/messages-service.c (+49/-1) test/Makefile.in (+4/-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: mp+101016@code.qastaging.launchpad.net |
Description of the change
indicator-messages 0.5.95
* Fix 0.5.94 blacklist regression.
* Fix broken icon images in Thunderbird (LP: #956147)
To post a comment you must log in.