diff options
Diffstat (limited to 'toolkit/content/license.html')
| -rw-r--r-- | toolkit/content/license.html | 83 |
1 files changed, 1 insertions, 82 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 9e0721906b..e9d2642354 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -104,7 +104,6 @@ <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> - <li><a href="about:license#kiss_fft">Kiss FFT License</a></li> #ifdef MOZ_USE_LIBCXX <li><a href="about:license#libc++">libc++ License</a></li> #endif @@ -154,9 +153,6 @@ <li><a href="about:license#validator">Validator License</a></li> <li><a href="about:license#vtune">VTune License</a></li> <li><a href="about:license#webrtc">WebRTC License</a></li> -#ifdef MOZ_DEFAULT_BROWSER_AGENT - <li><a href="about:license#wintoast">WinToast License</a></li> -#endif <li><a href="about:license#x264">x264 License</a></li> <li><a href="about:license#xiph">Xiph.org Foundation License</a></li> </ul> @@ -2041,7 +2037,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. <li><code>gfx/ots/</code></li> <li><code>gfx/ycbcr/</code></li> <li><code>ipc/chromium/</code></li> - <li><code>media/openmax_dl/</code></li> <li><code>toolkit/components/reputationservice/</code></li> <li><code>toolkit/components/url-classifier/chromium/</code></li> <li><code>tools/profiler/</code></li> @@ -3116,80 +3111,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </pre> - - <hr> - - <h1><a id="khronos"></a>Khronos group License</h1> - - <p>This license applies to the following files:</p> - - <ul> - <li><code>media/openmax_dl/dl/api/omxtypes.h</code></li> - <li><code>media/openmax_dl/dl/sp/api/omxSP.h</code></li> - </ul> - -<pre> -Copyright 2005-2008 The Khronos Group Inc. All Rights Reserved. - -These materials are protected by copyright laws and contain material -proprietary to the Khronos Group, Inc. You may use these materials -for implementing Khronos specifications, without altering or removing -any trademark, copyright or other notice from the specification. - -Khronos Group makes no, and expressly disclaims any, representations -or warranties, express or implied, regarding these materials, including, -without limitation, any implied warranties of merchantability or fitness -for a particular purpose or non-infringement of any intellectual property. -Khronos Group makes no, and expressly disclaims any, warranties, express -or implied, regarding the correctness, accuracy, completeness, timeliness, -and reliability of these materials. - -Under no circumstances will the Khronos Group, or any of its Promoters, -Contributors or Members or their respective partners, officers, directors, -employees, agents or representatives be liable for any damages, whether -direct, indirect, special or consequential damages for lost revenues, -lost profits, or otherwise, arising from or in connection with these -materials. - -Khronos and OpenMAX are trademarks of the Khronos Group Inc. -</pre> - - <hr> - - <h1><a id="kiss_fft"></a>Kiss FFT License</h1> - - <p>This license applies to files in the directory - <code>media/kiss_fft/</code>.</p> - -<pre> -Copyright (c) 2003-2010 Mark Borgerding - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * 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. - * Neither the author nor the names of any contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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. -</pre> - <hr> #ifdef MOZ_USE_LIBCXX @@ -3695,9 +3616,6 @@ SOFTWARE. <li><code>third_party/rust/synstructure</code></li> <li><code>third_party/rust/void</code></li> <li><code>js/src/zydis</code> (unless otherwise specified)</li> -#ifdef MOZ_DEFAULT_BROWSER_AGENT - <li><code>third_party/WinToast</code> unless otherwise specified</li> -#endif </ul> See the individual LICENSE files or headers for copyright owners.</p> @@ -5645,6 +5563,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. they are referred to below as "Distributable Code": <ul> <li><var>msvc*.dll</var> (C and C++ runtime libraries)</li> + <li><var>vcruntime*.dll</var> (Visual C++ Runtime)</li> </ul> </p> |