summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-17 12:27:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-17 12:27:12 -0400
commit30f7b1599cd02b8b9bbbb76463c5d4f84cba3552 (patch)
tree43998df0936fa64c2d3deeb0c5216bc6eb0d41df /debian/changelog
parentc34d8ae088e284b7585b7e32330945d1e9c922f2 (diff)
parentf5f88794713ebbbbc177d064f074a80ca23e9b79 (diff)
Merge branch 'master' into assistant
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5eaf9d52e..f90763aca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ git-annex (3.20120630) UNRELEASED; urgency=low
faster than forking the more optimised external program.
* SHAnE backends are now smarter about composite extensions, such as
.tar.gz Closes: #680450
+ * map: Write map.dot to .git/annex, which avoids watch trying to annex it.
-- Joey Hess <joeyh@debian.org> Sun, 01 Jul 2012 15:04:37 -0400