Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp://qastaging/~ubuntu-desktop/indicator-session/ubuntu
Proposed by
Charles Kerr
| Status: | Merged |
|---|---|
| Merged at revision: | 196 |
| Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
| Merge into: | lp://qastaging/~ubuntu-desktop/indicator-session/ubuntu |
| Diff against target: |
2140 lines (+775/-189) 37 files modified
AUTHORS (+1/-0) ChangeLog (+36/-0) Makefile.am (+2/-0) Makefile.am.coverage (+48/-0) Makefile.in (+59/-11) configure (+312/-11) configure.ac (+19/-6) data/Makefile.am (+0/-27) data/Makefile.in (+28/-64) data/extra-sessions/Makefile.in (+8/-1) data/icons/16x16/Makefile.in (+8/-1) data/icons/16x16/actions/Makefile.in (+8/-1) data/icons/16x16/status/Makefile.in (+8/-1) data/icons/22x22/Makefile.in (+8/-1) data/icons/22x22/actions/Makefile.in (+8/-1) data/icons/22x22/status/Makefile.in (+8/-1) data/icons/24x24/Makefile.in (+8/-1) data/icons/24x24/actions/Makefile.in (+8/-1) data/icons/24x24/status/Makefile.in (+8/-1) data/icons/32x32/Makefile.in (+8/-1) data/icons/32x32/actions/Makefile.in (+8/-1) data/icons/32x32/status/Makefile.in (+8/-1) data/icons/Makefile.in (+8/-1) data/icons/scalable/Makefile.in (+8/-1) data/icons/scalable/actions/Makefile.in (+8/-1) data/icons/scalable/status/Makefile.in (+8/-1) data/indicator-session-lock-screen.desktop.in.in (+0/-10) data/indicator-session-logout.desktop.in.in (+0/-10) data/indicator-session-restart.desktop.in.in (+0/-10) data/indicator-session-shutdown.desktop.in.in (+0/-10) debian/changelog (+8/-0) m4/gcov.m4 (+86/-0) po/POTFILES.in (+0/-4) src/Makefile.am (+12/-2) src/Makefile.in (+26/-7) src/gtk-logout-helper.c (+1/-0) src/session-service.c (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-session/upstream |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Pending | ||
|
Review via email:
|
|||
Description of the change
indicator-session 0.3.96
* Remove desktop files so they don't appear in the dash. (LP: #973181)
* Add gcov to the build for coverage statistics
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
