diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-07 17:36:58 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-07 17:36:58 -0400 |
commit | 244a312b17a8ba825507296f52ab9357220102c0 (patch) | |
tree | 8cc4ca37cd0650260f220d4e990af3f4e543c483 /debian/changelog | |
parent | 0605e5eaf6e5745e9c81d335ecf56b996a0b28e5 (diff) | |
parent | 3872945f876941d75d2b188546f9dc4b305cda8c (diff) |
Merge branch 'master' into safesemaphore
Conflicts:
debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 77fcf7bd5..2e14da4a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ git-annex (3.20121002) UNRELEASED; urgency=low * Depend on and use the Haskell SafeSemaphore library, which provides exception-safe versions of SampleVar and QSemN. Thanks, Ben Gamari for an excellent patch set. + * uninit: Unset annex.version. Closes: #689852 -- Joey Hess <joeyh@debian.org> Mon, 01 Oct 2012 15:09:49 -0400 |