aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-01 23:58:22 -0800
committerTed Gould <ted@gould.cx>2010-02-01 23:58:22 -0800
commit106a07d28ea82dffe74b1517cf94f836f700235f (patch)
treed013602c1d9e8c22577ecac5134abf0d1e9dac28 /debian
parent8f6a206a4689150d8887dd653f13e72b2d320a15 (diff)
parent71e471284796cd7e0ff1b15f6493ddbbb694c008 (diff)
downloadlibayatana-indicator-106a07d28ea82dffe74b1517cf94f836f700235f.tar.gz
libayatana-indicator-106a07d28ea82dffe74b1517cf94f836f700235f.tar.bz2
libayatana-indicator-106a07d28ea82dffe74b1517cf94f836f700235f.zip
* Upstream merge
* Various fixes to timeout handling in servcies and the service manager.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index bf71422..ccb0d37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libindicator (0.3.1-0ubuntu1~ppa2) UNRELEASED; urgency=low
+
+ * Upstream merge
+ * Various fixes to timeout handling in servcies and the
+ service manager.
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 01 Feb 2010 23:57:52 -0800
+
libindicator (0.3.1-0ubuntu1~ppa1) karmic; urgency=low
* Upstream release 0.3.1