summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-12-24 14:53:58 -0400
committerJoey Hess <joeyh@joeyh.name>2016-12-24 14:53:58 -0400
commit122b09e2f24cff55c65b84cbccd78ed640a234be (patch)
tree5f9f1929b2fccb9d9a783a0a53f56ba13aae7897 /CHANGELOG
parent1b18f539f2bace903c853ce828902a8061007da5 (diff)
downloadgit-repair-122b09e2f24cff55c65b84cbccd78ed640a234be.tar.gz
Merge from git-annex.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d6cc186..1a17a93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-repair (1.20161119) UNRELEASED; urgency=medium
+
+ * Merge from git-annex.
+
+ -- Joey Hess <id@joeyh.name> Sat, 24 Dec 2016 14:53:47 -0400
+
git-repair (1.20161118) unstable; urgency=medium
* Fix build with recent versions of cabal and ghc.