aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-14 17:07:14 -0500
committerTed Gould <ted@gould.cx>2010-04-14 17:07:14 -0500
commita341d130bea321f026e897381d0b983a626a6549 (patch)
tree5f689dccd0a7bc02df8f60302488cdf8a0f4c70e /debian
parentb7828c57bb679c28e14c955a19069451e156568a (diff)
parent9284777a7a53b0aa247b63d8b99359be7dd88296 (diff)
downloadlibdbusmenu-a341d130bea321f026e897381d0b983a626a6549.tar.gz
libdbusmenu-a341d130bea321f026e897381d0b983a626a6549.tar.bz2
libdbusmenu-a341d130bea321f026e897381d0b983a626a6549.zip
* Upstream Merge
* Don't allow setting children twice * Ref children of a menuitem * Return error when parent ID of getlayout can't be found
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 596124b..620ddd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1ubuntu1) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Don't allow setting children twice
+ * Ref children of a menuitem
+ * Return error when parent ID of getlayout can't be found
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 17:06:34 -0500
+
libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering1) lucid; urgency=low
* Upstream Merge