aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-05-05 00:02:04 -0400
committerRich Felker <dalias@aerifal.cx>2012-05-05 00:02:04 -0400
commit8cfbc8be82898c98fc0a93e2cc7912d9e649f32e (patch)
tree21b037517aecfe93b43aa0abde03c991c25bbef4 /COPYRIGHT
parenta23563024fc75a85af955ca203e26c52f939b414 (diff)
downloadmusl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.tar.gz
musl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.tar.xz
musl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.zip
update license of njk contributed code (x86_64 asm)
these changes are based on the following communication via email: "I hereby grant that all of the code I have contributed to musl on or before April 23, 2012 may be licensed under the terms of the following MIT license: Copyright (c) 2011-2012 Nicholas J. Kain Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT6
1 files changed, 4 insertions, 2 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index d46826c0..3571385e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -33,8 +33,10 @@ licensed under following terms: "Permission to use, copy, modify,
and/or distribute this code for any purpose with or without fee is
hereby granted. There is no warranty."
-The x86_64 port was written by Nicholas J. Kain. See individual files
-for their copyright status.
+The x86_64 port was written by Nicholas J. Kain. Several files (crt)
+were released into the public domain; others are licensed under the
+standard MIT license terms. See individual files for their copyright
+status.
All files which have no copyright comments are original works
Copyright © 2005-2012 Rich Felker, the main author of this library.