aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-05 13:11:23 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-05 13:11:23 -0500
commit848fcbb584fc202e7bbad03133e6ecec8c578ddd (patch)
treeb3a37fb62d7da90f95be76768e149c9278e1a425 /debian
parent2025ac02553ad74d8409a6343b4f495227014dbb (diff)
downloadayatana-indicator-messages-848fcbb584fc202e7bbad03133e6ecec8c578ddd.tar.gz
ayatana-indicator-messages-848fcbb584fc202e7bbad03133e6ecec8c578ddd.tar.bz2
ayatana-indicator-messages-848fcbb584fc202e7bbad03133e6ecec8c578ddd.zip
fix merge error
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b731f0..1ba2d79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ indicator-messages (0.5.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
* Fix 0.5.94 blacklist regression.
* Fix broken icon images in Thunderbird (LP: #956147)
- -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 12:27:14 -0500
+ -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 13:10:41 -0500
indicator-messages (0.5.94-0ubuntu1) precise; urgency=low