summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-15 15:20:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-15 15:20:11 -0400
commit53d2e81ffda7892dbb4bdef801eb31772094e647 (patch)
tree91e6e818f81b45c30744e3ded3383f29f909c6e7 /debian/changelog
parent85db1720e9cb3e06951554ffa1079b1b8a814f92 (diff)
parentaf7b6319d725e8090b32f74b397a9eba79e22978 (diff)
Merge branch 'master' into watch
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog11
1 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 60a42dcde..366854156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-git-annex (3.20120612) UNRELEASED; urgency=low
+git-annex (3.20120616) UNRELEASED; urgency=low
* watch: New subcommand, which uses inotify to watch for changes to
files and automatically annexes new files, etc, so you don't need
to manually run git commands when manipulating files.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400
+
+git-annex (3.20120614) unstable; urgency=medium
+
+ * addurl: Was broken by a typo introduced 2 released ago, now fixed.
+ Closes: #677576
* Install man page when run by cabal, in a location where man will
find it, even when installing under $HOME. Thanks, Nathan Collins
- -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400
+ -- Joey Hess <joeyh@debian.org> Thu, 14 Jun 2012 20:21:29 -0400
git-annex (3.20120611) unstable; urgency=medium