diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-13 00:44:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-13 00:44:05 +0000 |
| commit | c843a3e7b215bca5e896e1d56c2fa6332770ea83 (patch) | |
| tree | 39177b8c01c1729ed7cb8bc60b53393f58265139 /libc | |
| parent | c843d7667ada205ecbaf773531067076ed4ad271 (diff) | |
| parent | 4eeec44e29c4d3471c6574c7eb8fdf240a9f17d7 (diff) | |
| download | bionic-c843a3e7b215bca5e896e1d56c2fa6332770ea83.zip bionic-c843a3e7b215bca5e896e1d56c2fa6332770ea83.tar.gz bionic-c843a3e7b215bca5e896e1d56c2fa6332770ea83.tar.bz2 | |
Merge "Fix the qsort copyright notice (fixed upstream this afternoon)."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/NOTICE | 29 | ||||
| -rw-r--r-- | libc/upstream-freebsd/lib/libc/stdlib/qsort.c | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/libc/NOTICE b/libc/NOTICE index ff68ea4..2937518 100644 --- a/libc/NOTICE +++ b/libc/NOTICE @@ -2024,35 +2024,6 @@ SUCH DAMAGE. Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -------------------------------------------------------------------- - -Copyright (c) 1992, 1993 - The Regents of the University of California. All rights reserved. - This code is derived from software contributed to Berkeley by Ralph Campbell. diff --git a/libc/upstream-freebsd/lib/libc/stdlib/qsort.c b/libc/upstream-freebsd/lib/libc/stdlib/qsort.c index 3687b05..93e22cd 100644 --- a/libc/upstream-freebsd/lib/libc/stdlib/qsort.c +++ b/libc/upstream-freebsd/lib/libc/stdlib/qsort.c @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * |