Merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream into lp://qastaging/~ubuntu-desktop/indicator-appmenu/ubuntu
Proposed by
Ted Gould
| Status: | Merged |
|---|---|
| Merged at revision: | 216 |
| Proposed branch: | lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream |
| Merge into: | lp://qastaging/~ubuntu-desktop/indicator-appmenu/ubuntu |
| Diff against target: |
7429 lines (+5463/-511) 60 files modified
AUTHORS (+1/-0) ChangeLog (+452/-0) Makefile.am (+2/-1) Makefile.in (+6/-2) aclocal.m4 (+30/-0) config.h.in (+3/-0) configure (+242/-11) configure.ac (+3/-1) data/Makefile.in (+3/-0) debian/changelog (+13/-0) docs/Makefile.in (+3/-0) docs/devel/Makefile.in (+3/-0) docs/devel/html/HudAppMenuRegistrar.html (+1/-1) docs/devel/html/HudDbusmenuCollector.html (+6/-6) docs/devel/html/HudMenuModelCollector.html (+4/-4) docs/devel/html/HudSource.html (+10/-0) docs/devel/html/ch01.html (+1/-1) docs/devel/html/ch02.html (+1/-1) docs/devel/html/ch03.html (+1/-1) docs/devel/html/ch04.html (+1/-1) docs/devel/html/ch05.html (+1/-1) docs/man/Makefile.in (+3/-0) docs/man/hud-cli.1 (+2/-2) docs/man/hud-dump-application.1 (+2/-2) docs/man/hud-list-applications.1 (+2/-2) docs/man/hud-verify-app-info.1 (+2/-2) po/POTFILES.in (+3/-1) po/POTFILES.skip (+1/-1) scripts/Makefile.in (+3/-0) src/Makefile.am (+18/-24) src/Makefile.in (+109/-12) src/gactionmuxer.c (+493/-0) src/gactionmuxer.h (+51/-0) src/gactionobservable.c (+78/-0) src/gactionobservable.h (+62/-0) src/gactionobserver.c (+159/-0) src/gactionobserver.h (+88/-0) src/gtkmodelmenu.c (+270/-0) src/gtkmodelmenu.h (+37/-0) src/gtkmodelmenuitem.c (+335/-0) src/gtkmodelmenuitem.h (+43/-0) src/hud-gtk.ui (+0/-119) src/hud-verify-app-info.c (+23/-26) src/hudstringlist.c (+1/-0) src/indicator-appmenu.c (+114/-67) src/window-menu-dbusmenu.c (+112/-142) src/window-menu-dbusmenu.h (+25/-54) src/window-menu-model.c (+646/-0) src/window-menu-model.h (+56/-0) src/window-menu.c (+218/-0) src/window-menu.h (+98/-0) tests/Makefile.in (+3/-0) tests/manual/Makefile.in (+3/-0) tests/test-bad-app-info.c (+23/-26) tools-vala/Makefile.am (+24/-0) tools-vala/Makefile.in (+706/-0) tools-vala/hud-gtk.c (+740/-0) tools-vala/hud-gtk.ui (+119/-0) tools-vala/hud_gtk_vala.stamp (+1/-0) tools/Makefile.in (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~indicator-applet-developers/ubuntu/precise/indicator-appmenu/upstream |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Pending | ||
|
Review via email:
|
|||
Description of the change
0.3.95
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
