summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-16 18:47:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-16 18:47:04 -0400
commit3a020e599ef3f3dcc8cd0c0baab95f60c95ffda4 (patch)
tree0ebe711b86a7cadbeb78fe0a63e1600237a0b5ef /debian/changelog
parent63360f776783d2527af8c8ed9a4dd79d3159b9a1 (diff)
parent40652e0eaf019ce076fcee24c25fb1f8c950ac5d (diff)
Merge branch 'master' into reorg
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog11
1 files changed, 10 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c71c5ee25..47a914812 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,15 @@ git-annex (0.20110316) experimental; urgency=low
directory would contain fewer than 1024 files.)
* The setkey, fromkey, and dropkey subcommands have changed how
the key is specified. --backend is no longer used with these.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 16 Mar 2011 16:20:23 -0400
+
+git-annex (0.24) unstable; urgency=low
+
+ Branched the 0.24 series, which will be maintained for a while to
+ support v1 git-annex repos, while main development moves to the 0.2011
+ series, with v2 git-annex repos.
+
* Add Suggests on graphviz. Closes: #618039
* When adding files to the annex, the symlinks pointing at the annexed
content are made to have the same mtime as the original file.
@@ -20,7 +29,7 @@ git-annex (0.20110316) experimental; urgency=low
like metastore to be used with annexed files.
(Currently this is only done on systems supporting POSIX 200809.)
- -- Joey Hess <joeyh@debian.org> Wed, 16 Mar 2011 16:20:23 -0400
+ -- Joey Hess <joeyh@debian.org> Wed, 16 Mar 2011 18:35:13 -0400
git-annex (0.23) unstable; urgency=low