diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-01 11:29:13 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-01 11:29:13 +0200 |
| commit | 983a91c50de70a528edafa6fc05dfa9ffcc13b98 (patch) | |
| tree | 8da346cb82d9cb9bdf8b6c3500f88839c3c215a9 /docs/libdbusmenu-gtk/reference/html/object-tree.html | |
| parent | 5259846f36df1eb4703c56cae6a08a4bd0b4ed15 (diff) | |
| parent | 6830905830ac78271515c586442a090cf7a0e3ff (diff) | |
| download | libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.gz libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.tar.bz2 libdbusmenu-983a91c50de70a528edafa6fc05dfa9ffcc13b98.zip | |
Merge Ubuntu.
Preserve Maintainer and Vcs-* fields.
From Ubuntu:
* New upstream release.
* Adding support for menu shortcuts (LP: #591293)
* Fixing distcheck of documentation builds
* Autogen.sh fix for adding custom prefix (LP: #595565)
* Fixing children property name to match spec (LP: #597321)
* Merging in Debian branch
* debian/control: Switching branch on this branch to be the
dbusmenu-team.
* debian/rules: Updating shlibs to 0.3.3 for shortcut API additions
Diffstat (limited to 'docs/libdbusmenu-gtk/reference/html/object-tree.html')
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/html/object-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/libdbusmenu-gtk/reference/html/object-tree.html b/docs/libdbusmenu-gtk/reference/html/object-tree.html index 7a7ee78..4c07d6d 100644 --- a/docs/libdbusmenu-gtk/reference/html/object-tree.html +++ b/docs/libdbusmenu-gtk/reference/html/object-tree.html @@ -23,8 +23,8 @@ <div class="titlepage"><div><div><h2 class="title"> <a name="object-tree"></a>Object Hierarchy</h2></div></div></div> <pre class="screen"> - <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a> - <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> <a href="/usr/share/gtk-doc/html/gtk/GtkObject.html">GtkObject</a> <a href="/usr/share/gtk-doc/html/gtk/GtkWidget.html">GtkWidget</a> <a href="/usr/share/gtk-doc/html/gtk/GtkContainer.html">GtkContainer</a> |