summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-30 20:38:59 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-30 20:38:59 -0400
commit252376d639ca6f24ad45f598bb70fdaa463c9f9e (patch)
treece93b99bf1df91a35e0b679dfaed26a2024c91f0 /debian/changelog
parentb538f45fafdf161c24f07562ac1bd73f1476ace9 (diff)
parent230bc8334bb7a947a61a0e213c51fca18decde1c (diff)
Merge branch 'master' into autosync
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog5
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index bbed54765..f3e830c01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,14 @@ git-annex (3.20111212) UNRELEASED; urgency=low
* Test suite improvements. Current top-level test coverage: 75%
* Improve deletion of files from rsync special remotes. Closes: #652849
* Add --include, which is the same as --not --exclude.
- * Can now be built with older git versions (before 1.7.7); the resulting
- binary should only be used with old git.
* Format strings can be specified using the new --format option, to control
what is output by git annex find.
* Support git annex find --json
* Fixed behavior when multiple insteadOf configs are provided for the
same url base.
+ * Can now be built with older git versions (before 1.7.7); the resulting
+ binary should only be used with old git.
+ * Updated to build with monad-control 0.3.
-- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400