summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2020-01-02 12:34:10 -0400
committerJoey Hess <joeyh@joeyh.name>2020-01-02 12:42:57 -0400
commit9df8a6eb9405dde4464d27133c04f5ee539a85de (patch)
tree8a7ac5f52be8679f8a2525515a0b2c1b715c99ad /CHANGELOG
parent16022a8b98f4bc134542e78a42538364d2f97d92 (diff)
downloadgit-repair-9df8a6eb9405dde4464d27133c04f5ee539a85de.tar.gz
merge from git-annex and relicense accordingly
Merge git library and utility from git-annex. The former is now relicensed AGPL, so git-repair as a whole becomes AGPL. For simplicity, I am relicensing the remainder of the code in git-repair AGPL as well, per the header changes in this commit. While that code is also technically available under the GPL license, as it's been released under that license before, changes going forward will be only released by me under the AGPL.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG8
1 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9c8889d..50f9332 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,12 @@
-git-repair (1.20170627) UNRELEASED; urgency=medium
+git-repair (1.20200102) unstable; urgency=medium
+ * Relicensed AGPL.
* Merge from git-annex.
+ * Removed the network-uri build flag.
+ * Increased required version of several dependencies.
+ * Added dependencies on deepseq, attoparsec and filepath-bytestring.
- -- Joey Hess <id@joeyh.name> Thu, 14 Dec 2017 12:55:44 -0400
+ -- Joey Hess <id@joeyh.name> Thu, 02 Jan 2020 12:39:13 -0400
git-repair (1.20170626) unstable; urgency=medium