Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 77999d41ee0c (bug 959773) to fix bustage on b2g-device Builds on a CLOSED TREE

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-01-31 15:02:26 +01:00
parent 24b2ed8ec1
commit b6b569cf47
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
toolkit/content/license.html
View File

@ -129,7 +129,6 @@
<li><a href="about:license#v8">V8 License</a></li>
<li><a href="about:license#vtune">VTune License</a></li>
<li><a href="about:license#webrtc">WebRTC License</a></li>
<li><a href="about:license#x264">x264 License</a></li>
<li><a href="about:license#xiph">Xiph.org Foundation License</a></li>
</ul>
@ -2996,8 +2995,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
<h1><a id="libyuv"></a>libyuv License</h1>
<p>This license applies to files in the directory
<span class="path">media/webrtc/trunk/third_party/libyuv</span> except
for the file <span class="path">media/webrtc/trunk/third_party/libyuv/source/x86inc.asm</span>.
<span class="path">media/webrtc/trunk/third_party/libyuv</span>.
</p>
<pre>
@ -4274,35 +4272,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
<hr>
<h1><a id="x264"></a>x264 License</h1>
<p>This license applies to the file <span class="path">
media/webrtc/trunk/third_party/libyuv/source/x86inc.asm</span>.
</p>
<pre>
Copyright (C) 2005-2012 x264 project
Authors: Loren Merritt <lorenm@u.washington.edu>
Anton Mitrofanov <BugMaster@narod.ru>
Jason Garrett-Glaser <darkshikari@gmail.com>
Henrik Gramner <hengar-6@student.ltu.se>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
</pre>
<hr>
<h1><a id="xiph"></a>Xiph.org Foundation License</h1>