summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-11-11 15:01:13 -0400
committerJoey Hess <joeyh@joeyh.name>2016-11-11 15:01:13 -0400
commit962e279e17c1f3cf3be49ffdfb5e7310711a220c (patch)
treed9953d9e57dea51c24ccaf4d7e64731010546f4f /CHANGELOG
parent7d7f93302c72cbe1a16598b0c90a49c10aaf3669 (diff)
downloadgit-repair-962e279e17c1f3cf3be49ffdfb5e7310711a220c.tar.gz
merge from git-annex
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 94f0743..c57824c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,13 @@
-git-repair (1.20151216) UNRELEASED; urgency=medium
+git-repair (1.20161111) unstable; urgency=medium
* git-repair.cabal: Add Setup-Depends.
* Updated cabal file explictly lists source files. The tarball
on hackage will include only the files needed for cabal install;
it is NOT the full git-repair source tree.
* debian/changelog: Converted to symlinks to CHANGELOG.
+ * Merge from git-annex.
- -- Joey Hess <id@joeyh.name> Wed, 04 May 2016 12:16:33 -0400
+ -- Joey Hess <id@joeyh.name> Fri, 11 Nov 2016 14:56:14 -0400
git-repair (1.20151215) unstable; urgency=medium