Merge lp://qastaging/~dbusmenu-team/ubuntu/precise/libdbusmenu/upstream into lp://qastaging/~ubuntu-desktop/libdbusmenu/ubuntu
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 197 |
Proposed branch: | lp://qastaging/~dbusmenu-team/ubuntu/precise/libdbusmenu/upstream |
Merge into: | lp://qastaging/~ubuntu-desktop/libdbusmenu/ubuntu |
Diff against target: |
11864 lines (+11365/-22) 62 files modified
ChangeLog (+32/-0) configure (+11/-11) configure.ac (+3/-3) debian/changelog (+10/-0) docs/libdbusmenu-glib/reference/html/annotation-glossary.html (+83/-0) docs/libdbusmenu-glib/reference/html/api-index-deprecated.html (+31/-0) docs/libdbusmenu-glib/reference/html/api-index-full.html (+593/-0) docs/libdbusmenu-glib/reference/html/ch01.html (+50/-0) docs/libdbusmenu-glib/reference/html/index.html (+49/-0) docs/libdbusmenu-glib/reference/html/index.sgml (+176/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html (+607/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html (+1893/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitemProxy.html (+166/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuServer.html (+412/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-Types.html (+276/-0) docs/libdbusmenu-glib/reference/html/libdbusmenu-glib.devhelp2 (+161/-0) docs/libdbusmenu-glib/reference/html/object-tree.html (+32/-0) docs/libdbusmenu-glib/reference/html/style.css (+266/-0) docs/libdbusmenu-glib/reference/tmpl/client.sgml (+228/-0) docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml (+59/-0) docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml (+721/-0) docs/libdbusmenu-glib/reference/tmpl/server.sgml (+171/-0) docs/libdbusmenu-glib/reference/tmpl/types.sgml (+109/-0) docs/libdbusmenu-glib/reference/version.xml (+1/-1) docs/libdbusmenu-glib/reference/xml/annotation-glossary.xml (+80/-0) docs/libdbusmenu-glib/reference/xml/api-index-deprecated.xml (+8/-0) docs/libdbusmenu-glib/reference/xml/api-index-full.xml (+153/-0) docs/libdbusmenu-glib/reference/xml/client.xml (+448/-0) docs/libdbusmenu-glib/reference/xml/menuitem-proxy.xml (+114/-0) docs/libdbusmenu-glib/reference/xml/menuitem.xml (+1331/-0) docs/libdbusmenu-glib/reference/xml/server.xml (+309/-0) docs/libdbusmenu-glib/reference/xml/types.xml (+192/-0) docs/libdbusmenu-gtk/reference/html/annotation-glossary.html (+47/-0) docs/libdbusmenu-gtk/reference/html/api-index-deprecated.html (+31/-0) docs/libdbusmenu-gtk/reference/html/api-index-full.html (+119/-0) docs/libdbusmenu-gtk/reference/html/ch01.html (+45/-0) docs/libdbusmenu-gtk/reference/html/index.html (+44/-0) docs/libdbusmenu-gtk/reference/html/index.sgml (+43/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkClient.html (+347/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-DbusmenuGtkMenu.html (+187/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-menuitem.html (+274/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk-parser.html (+118/-0) docs/libdbusmenu-gtk/reference/html/libdbusmenu-gtk.devhelp2 (+38/-0) docs/libdbusmenu-gtk/reference/html/object-tree.html (+32/-0) docs/libdbusmenu-gtk/reference/html/style.css (+266/-0) docs/libdbusmenu-gtk/reference/tmpl/client.sgml (+110/-0) docs/libdbusmenu-gtk/reference/tmpl/menu.sgml (+56/-0) docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml (+86/-0) docs/libdbusmenu-gtk/reference/tmpl/parser.sgml (+42/-0) docs/libdbusmenu-gtk/reference/version.xml (+1/-1) docs/libdbusmenu-gtk/reference/xml/annotation-glossary.xml (+32/-0) docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml (+8/-0) docs/libdbusmenu-gtk/reference/xml/api-index-full.xml (+32/-0) docs/libdbusmenu-gtk/reference/xml/client.xml (+238/-0) docs/libdbusmenu-gtk/reference/xml/menu.xml (+133/-0) docs/libdbusmenu-gtk/reference/xml/menuitem.xml (+178/-0) docs/libdbusmenu-gtk/reference/xml/parser.xml (+77/-0) libdbusmenu-glib/enum-types.h (+1/-1) libdbusmenu-glib/enum-types.h.in (+1/-1) libdbusmenu-gtk/genericmenuitem-enum-types.h (+1/-1) libdbusmenu-gtk/genericmenuitem-enum-types.h.in (+1/-1) libdbusmenu-gtk/genericmenuitem.c (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~dbusmenu-team/ubuntu/precise/libdbusmenu/upstream |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email:
|
Description of the change
0.6.2
To post a comment you must log in.