diff options
| author | kennytm <kennytm@gmail.com> | 2019-01-05 23:56:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 23:56:49 +0800 |
| commit | 69d3c1a1882e9a4e9a814add58fab3d735af5c32 (patch) | |
| tree | cad3f858fa1b7815b2ba7b1c40d678fcfb4fd2ed | |
| parent | aa5fc743b5e0d67c7db290ae8f560dfb0bbc86ea (diff) | |
| parent | 0fd5003b38457cdb476ad4d3d3faf9f210c1f2df (diff) | |
| download | rust-69d3c1a1882e9a4e9a814add58fab3d735af5c32.tar.gz rust-69d3c1a1882e9a4e9a814add58fab3d735af5c32.zip | |
Rollup merge of #57267 - rust-lang:SimonSapin-patch-1, r=varkor
src/jemalloc is gone, remove its mention from COPYRIGHT The `src/jemalloc` submodule was removed in 61e89446ef6e115630faa75c985c599d739f7586 / https://github.com/rust-lang/rust/pull/55238.
| -rw-r--r-- | COPYRIGHT | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/COPYRIGHT b/COPYRIGHT index e2d0ed77224..6596c5a3d9a 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -229,35 +229,3 @@ their own copyright notices and license terms: NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -* jemalloc, under src/jemalloc: - - Copyright (C) 2002-2014 Jason Evans - <jasone@canonware.com>. All rights reserved. - Copyright (C) 2007-2012 Mozilla Foundation. - All rights reserved. - Copyright (C) 2009-2014 Facebook, Inc. - 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(s), - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice(s), - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) - ``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 COPYRIGHT HOLDER(S) - 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. |