diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-03-10 15:05:47 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-10 15:08:21 -0400 |
| commit | 6b92a506b974816fe7bee3a19d902bb739c4c182 (patch) | |
| tree | d2019c14dc12461b6a8d3acee18e3fc27ada4bc3 | |
| parent | 71a0cb7c17c003ae91207f81f956897e349c7de7 (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.
| -rw-r--r-- | COPYRIGHT | 4 | ||||
| -rw-r--r-- | Utility/Gpg.hs | 2 |
2 files changed, 1 insertions, 5 deletions
@@ -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> diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index a5d382083..f6173cdb4 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -2,7 +2,7 @@ - - Copyright 2011 Joey Hess <id@joeyh.name> - - - Licensed under the GNU GPL version 3 or higher. + - License: BSD-2-clause -} {-# LANGUAGE CPP #-} |