mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

merge spwhitton's s/MIT/Expat/ change

Browse source 
I forget the details of this name for the MIT license, but I assume he
knows what he's doing.
This commit is contained in:
Joey Hess 2018-07-11 16:08:23 -04:00
parent cc2cb46857
commit 971456f106
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
COPYRIGHT
View file

@ -27,7 +27,7 @@ License: BSD-2-clause
Files: Utility/HttpManagerRestricted.hs Files: Utility/HttpManagerRestricted.hs
Copyright: 2018 Joey Hess <id@joeyh.name> Copyright: 2018 Joey Hess <id@joeyh.name>
2013 Michael Snoyman 2013 Michael Snoyman
License: MIT License: Expat
Files: Utility/* Files: Utility/*
Copyright: 2012-2018 Joey Hess <id@joeyh.name> Copyright: 2012-2018 Joey Hess <id@joeyh.name>
@ -53,10 +53,10 @@ License: GPL-3+
Files: static/jquery* Files: static/jquery*
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation © 2011 The Dojo Foundation
License: MIT or GPL-2 License: Expat or GPL-2
The full text of version 2 of the GPL is distributed in The full text of version 2 of the GPL is distributed in
/usr/share/common-licenses/GPL-2 on Debian systems. The text of the MIT /usr/share/common-licenses/GPL-2 on Debian systems. The text of the Expat
license is in the MIT section below. license is in the Expat section below.
Files: static/*/bootstrap* static/*/glyphicons-halflings* Files: static/*/bootstrap* static/*/glyphicons-halflings*
Copyright: 2012-2014 Twitter, Inc. Copyright: 2012-2014 Twitter, Inc.
@ -140,7 +140,7 @@ License: BSD-2-clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
License: MIT License: Expat
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including "Software"), to deal in the Software without restriction, including