aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-06 16:03:52 -0500
committerTed Gould <ted@gould.cx>2010-04-06 16:03:52 -0500
commita57b84e1243c416a9b1a164681cba27556d8a301 (patch)
tree3ce5175d7a90270c269ff4d23e15065a30e2b4dc
parent2eb97c23add4faee7bf7fc411ebb897ba83e5d27 (diff)
parent0cf6e6003e546c808968c2a1cd909e10be00a12f (diff)
downloadlibayatana-indicator-a57b84e1243c416a9b1a164681cba27556d8a301.tar.gz
libayatana-indicator-a57b84e1243c416a9b1a164681cba27556d8a301.tar.bz2
libayatana-indicator-a57b84e1243c416a9b1a164681cba27556d8a301.zip
Merge from Ubuntu desktop
-rw-r--r--debian/changelog4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ad342ea..0a68c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libindicator (0.3.6-0ubuntu1~ppa2) UNRELEASED; urgency=low
+libindicator (0.3.6-0ubuntu2~ppa1) UNRELEASED; urgency=low
* Upstream merge
* Use the domain in desktop files for shortcuts (LP: #549322)
-- Ted Gould <ted@ubuntu.com> Tue, 06 Apr 2010 15:58:33 -0500
-libindicator (0.3.6-0ubuntu1~ppa1) lucid; urgency=low
+libindicator (0.3.6-0ubuntu1) lucid; urgency=low
* Upstream release 0.3.6
* Adding in scroll signals for the indicators