aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-02-24 12:30:42 -0600
committerTed Gould <ted@gould.cx>2011-02-24 12:30:42 -0600
commit1153cfedbbc67c667e117d18d5bf15a3a5a31a2a (patch)
tree7ce4d4d883112f9e8725fbcfebe7250832c3d581 /debian
parent5c94d5556de25dea4033364d72b526f2bf678728 (diff)
parent5d4e1c63e3e0fc2bcce9e1217e6565b8d16a83b4 (diff)
downloadlibdbusmenu-1153cfedbbc67c667e117d18d5bf15a3a5a31a2a.tar.gz
libdbusmenu-1153cfedbbc67c667e117d18d5bf15a3a5a31a2a.tar.bz2
libdbusmenu-1153cfedbbc67c667e117d18d5bf15a3a5a31a2a.zip
Merging with Ubuntu Desktop
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 012635f..7e08ca0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low
+
+ * Merged from trunk (rev 220)
+ - Cleaning up cleaning up so we don't unref twice and crash
+ - Fixing the signatures to make them more consistent
+ - Adding defaults to translatable files
+ - Support a set of defaults and not sending them over the bus.
+ - Fixing annotations and adding tests with python.
+
+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 23 Feb 2011 11:34:57 -0500
+
libdbusmenu (0.3.98-0ubuntu3) natty; urgency=low
* debian/control: