diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-05-05 00:02:04 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-05-05 00:02:04 -0400 |
| commit | 8cfbc8be82898c98fc0a93e2cc7912d9e649f32e (patch) | |
| tree | 21b037517aecfe93b43aa0abde03c991c25bbef4 /src/setjmp | |
| parent | a23563024fc75a85af955ca203e26c52f939b414 (diff) | |
| download | musl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.zip musl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.tar.gz musl-8cfbc8be82898c98fc0a93e2cc7912d9e649f32e.tar.bz2 | |
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 'src/setjmp')
| -rw-r--r-- | src/setjmp/x86_64/longjmp.s | 2 | ||||
| -rw-r--r-- | src/setjmp/x86_64/setjmp.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s index 444076f..e175a4b 100644 --- a/src/setjmp/x86_64/longjmp.s +++ b/src/setjmp/x86_64/longjmp.s @@ -1,4 +1,4 @@ -/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */ +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */ .global _longjmp .global longjmp .type _longjmp,@function diff --git a/src/setjmp/x86_64/setjmp.s b/src/setjmp/x86_64/setjmp.s index 5b3173b..98f58b8 100644 --- a/src/setjmp/x86_64/setjmp.s +++ b/src/setjmp/x86_64/setjmp.s @@ -1,4 +1,4 @@ -/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */ +/* Copyright 2011-2012 Nicholas J. Kain, licensed under standard MIT license */ .global __setjmp .global _setjmp .global setjmp |