aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-03-10 15:05:47 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-03-10 15:08:21 -0400
commit6b92a506b974816fe7bee3a19d902bb739c4c182 (patch)
treed2019c14dc12461b6a8d3acee18e3fc27ada4bc3 /COPYRIGHT
parent71a0cb7c17c003ae91207f81f956897e349c7de7 (diff)
relicense Utility/GPG.hs BSD as the rest of Utility is
The COPYRIGHT had Utility/DirWatcher* listed as GPL, but they were actually BSD licensed. No idea why I put the GPL on Utility/GPG.hs file originally. I wrote all of it, except for guilhem's small changes to it in a7f50205bb1ccd41d4a9ab4e11d984e643be755f, which seem too small to be independently copyrightable. I'm relicencing it BSD.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT4
1 files changed, 0 insertions, 4 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 8f677610d..d7a18819f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -24,10 +24,6 @@ Files: Utility/*
Copyright: 2012-2017 Joey Hess <id@joeyh.name>
License: BSD-2-clause
-Files: Utility/Gpg.hs Utility/DirWatcher*
-Copyright: © 2010-2014 Joey Hess <id@joeyh.name>
-License: GPL-3+
-
Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/*
Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/>
2010 Joey Hess <id@joeyh.name>