diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:55:46 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:57:05 +0200 |
| commit | b53db93006f732fb2e140137e4713dedca1700d9 (patch) | |
| tree | a2c1817c0fa6dd40d7da600148db70566e3a359d /toolkit | |
| parent | db4b6dc1dab3dd099c93253b96fbe8089c2f9e60 (diff) | |
| parent | f7b98c15a1c0a458b4bfa420f1743c8abfbdf7a8 (diff) | |
| download | uxp-b53db93006f732fb2e140137e4713dedca1700d9.tar.gz | |
Merge branch 'malloc-rewrite'
This resolves #263.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/license.html | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 45889a191f..a348fdfa60 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -103,7 +103,6 @@ <li><a href="about:license#icu">ICU License</a></li> <li><a href="about:license#immutable">Immutable.js License</a></li> <li><a href="about:license#jpnic">Japan Network Information Center License</a></li> - <li><a href="about:license#jemalloc">jemalloc License</a></li> <li><a href="about:license#jquery">jQuery License</a></li> <li><a href="about:license#k_exp">k_exp License</a></li> <li><a href="about:license#khronos">Khronos group License</a></li> @@ -3527,46 +3526,6 @@ Chiyoda-ku, Tokyo 101-0047, Japan. <hr> - <h1><a id="jemalloc"></a>jemalloc License</h1> - - <p>This license applies to files in the directories - <span class="path">memory/mozjemalloc/</span> and - <span class="path">memory/jemalloc/</span>. - </p> - -<pre> -Copyright (C) 2002-2012 Jason Evans <jasone@canonware.com>. -All rights reserved. -Copyright (C) 2007-2012 Mozilla Foundation. All rights reserved. -Copyright (C) 2009-2012 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 as - the first lines of this file unmodified other than the possible - addition of one or more copyright notices. -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. -</pre> - - <hr> - <h1><a id="jquery"></a>jQuery License</h1> <p>This license applies to all copies of jQuery in the code.</p> |