aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-10 14:28:47 -0600
committerTed Gould <ted@gould.cx>2011-02-10 14:28:47 -0600
commit8cd6632ced5515d3793035ea18156896d4d96d5e (patch)
treee4525df62fe66c529b435e86a4821e2b6f9e8c86
parent496b6ee260d93a2428e65946438dfe522d8702dd (diff)
parent680497cd7a666d1a33396aacf4cce82d7133898c (diff)
downloadlibdbusmenu-8cd6632ced5515d3793035ea18156896d4d96d5e.tar.gz
libdbusmenu-8cd6632ced5515d3793035ea18156896d4d96d5e.tar.bz2
libdbusmenu-8cd6632ced5515d3793035ea18156896d4d96d5e.zip
Merge U. Desktop
-rw-r--r--debian/changelog9
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 7a3738a..122d0f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-libdbusmenu (0.3.96-0ubuntu3~ppa1) natty; urgency=low
+libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
- * Upstream Merge
- * Parser fixes for children added in GtkMenuShell (LP: #)
+ * libdbusmenu-gtk/parser.c
+ - Handle ChildAdded on GtkShell items and clean up the code so that it
+ has single functions for doing common operations. (LP: #709839)
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:16:47 -0600
+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 07 Feb 2011 09:29:09 -0500
libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low