Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-application/upstream into lp://qastaging/~ubuntu-desktop/indicator-application/ubuntu
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Merged at revision: | 291 |
Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-application/upstream |
Merge into: | lp://qastaging/~ubuntu-desktop/indicator-application/ubuntu |
Diff against target: |
18972 lines (+9251/-8897) 25 files modified
ChangeLog (+24/-0) INSTALL (+7/-2) Makefile.am (+1/-34) Makefile.am.coverage (+48/-0) Makefile.in (+50/-41) aclocal.m4 (+5/-8606) compile (+183/-16) config.guess (+31/-18) config.sub (+39/-26) configure (+104/-65) configure.ac (+5/-5) data/Makefile.in (+5/-2) debian/changelog (+8/-0) depcomp (+66/-8) install-sh (+18/-11) m4/gcov.m4 (+13/-10) 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) missing (+4/-49) src/Makefile.in (+5/-2) src/indicator-application.c (+1/-0) tests/Makefile.in (+5/-2) |
To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-application/upstream |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+101612@code.qastaging.launchpad.net |
Description of the change
indicator-
* Fix parent pointer object for unity-panel-service
* Improved gcov rules in our Automake files
To post a comment you must log in.