Backed out changeset 77999d41ee0c (bug 959773) to fix bustage on b2g-device Builds on a CLOSED TREE
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Fri, 31 Jan 2014 15:02:26 +0100
changeset 182268 1937b96bc69e1b5da355012d7d847ce1d503b8af
parent 182267 660cafafd05bbe392266143b9e03be2e57d55b18
child 182269 ed8501afc8cc506edf3524177d61f30fbf079258
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs959773
milestone29.0a1
backs out77999d41ee0cba7f66f2237a1f183f8242b9ba9a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 77999d41ee0c (bug 959773) to fix bustage on b2g-device Builds on a CLOSED TREE
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -124,17 +124,16 @@
       <li><a href="about:license#sunsoft">SunSoft License</a></li>
       <li><a href="about:license#unicode">Unicode License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>
       <li><a href="about:license#uszeged">University of Szeged License</a></li>
       <li><a href="about:license#hunspell-en-US">US English Spellchecking Dictionary Licenses</a></li>
       <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>
 
 <br>
 
     <ul>
       <li><a href="about:license#other-notices">Other Required Notices</a>
       <li><a href="about:license#optional-notices">Optional Notices</a>
@@ -2991,18 +2990,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THI
 OF THE POSSIBILITY OF SUCH DAMAGE.
 </pre>
 
     <hr>
 
     <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>
 Copyright (c) 2011, The LibYuv project authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -4271,45 +4269,16 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTI
 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="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>
 
     <p>This license applies to files in the following directories
       with the specified copyright year ranges:</p>
     <ul>
       <li><span class="path">media/libogg/</span>, 2002</li>
       <li><span class="path">media/libtheora/</span>, 2002-2007</li>
       <li><span class="path">media/libvorbis/</span>, 2002-2004</li>