summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-09 17:58:59 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-09 17:58:59 -0400
commit5e2f86978fb5b5916cd3e16ac2db257726208111 (patch)
tree1c29e367aa86d54928408a52dfbc6b486434bda2 /debian/changelog
parentd2d501503d9aa19787466129394141c794bb84e6 (diff)
parent24edbdd707afafd5579c7e3e0de3dae72e73b881 (diff)
Merge branch 'master' into smudge
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 6e4ba115c..97dc5fab9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+
* annex.version increased to 6, but version 5 is also still supported.
* The upgrade to version 6 is not done fully automatically, because
upgrading a direct mode repository to version 6 will prevent old
@@ -8,7 +9,7 @@
filter. Note that this changes the default behavior of git add in a
newly initialized repository; it will add files to the annex.
-git-annex (5.20151117) UNRELEASED; urgency=medium
+git-annex (5.20151208) unstable; urgency=medium
* Build with -j1 again to get reproducible build.
* Display progress meter in -J mode when copying from a local git repo,
@@ -33,7 +34,7 @@ git-annex (5.20151117) UNRELEASED; urgency=medium
* Fix reversion in handling of long filenames, particularly when using
addurl/importfeed, which was introduced in the previous release.
- -- Joey Hess <id@joeyh.name> Mon, 16 Nov 2015 16:49:34 -0400
+ -- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400
git-annex (5.20151116) unstable; urgency=medium