Bug 1418130 - add prop-types license and remove activity-stream from list of reselect license users, r=gerv
authordmose@mozilla.org <dmose@mozilla.org>
Thu, 16 Nov 2017 15:54:59 -0800
changeset 396528 28f5404cc95e8e911bb21545b73638473b4aecd9
parent 396527 75910829e8902445ec0e5e3a6639a0d6afa51434
child 396529 ebcc9ceb0842d5e925d693d0e48eeef80c0d0877
push id57030
push userebalazs@mozilla.com
push dateFri, 15 Dec 2017 09:53:30 +0000
treeherderautoland@3e65a15f6d0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs1418130
milestone59.0a1
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
Bug 1418130 - add prop-types license and remove activity-stream from list of reselect license users, r=gerv MozReview-Commit-ID: ENYKMJ6iq5W
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -144,16 +144,17 @@
       <li><a href="about:license#owning_ref">owning_ref License</a></li>
       <li><a href="about:license#pbkdf2-sha256">pbkdf2_sha256 License</a></li>
       <li><a href="about:license#pdfium">PDFium License</a></li>
       <li><a href="about:license#phf">phf, phf_codegen, phf_generator, phf_shared License</a></li>
       <li><a href="about:license#polymer">Polymer License</a></li>
       <li><a href="about:license#praton">praton License</a></li>
       <li><a href="about:license#praton1">praton and inet_ntop License</a></li>
       <li><a href="about:license#precomputed-hash">precomputed-hash License</a></li>
+      <li><a href="about:license#prop-types">prop-types License</a></li>
       <li><a href="about:license#qcms">qcms License</a></li>
       <li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
       <li><a href="about:license#raven-js">Raven.js License</a></li>
       <li><a href="about:license#react">React License</a></li>
       <li><a href="about:license#react-intl">React Intl License</a></li>
       <li><a href="about:license#react-redux">React-Redux License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#redox_syscall">redox_syscall License</a></li>
@@ -5369,16 +5370,48 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE F
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 </pre>
 
 
     <hr>
 
+    <h1><a id="prop-types"></a>prop-types License</h1>
+
+    <p>This license applies to the files
+    <code>browser/extensions/activity-stream/vendor/prop-types*</code>.</p>
+
+<pre>
+MIT License
+
+Copyright (c) 2013-present, Facebook, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+</pre>
+
+
+    <hr>
+
     <h1><a id="qcms"></a>qcms License</h1>
 
     <p>This license applies to certain files in the directory
       <code>gfx/qcms/</code>.</p>
 <pre>
 Copyright (C) 2009 Mozilla Corporation
 Copyright (C) 1998-2007 Marti Maria
 
@@ -5657,18 +5690,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
 SOFTWARE.
 </pre>
 
 <hr>
 
 <h1><a id="reselect"></a>Reselect License</h1>
 
 <p>This license applies to the file
-<code>devtools/client/shared/vendor/reselect.js</code> and
-<code>browser/extensions/activity-stream/vendor/reselect.js</code>.</p>
+<code>devtools/client/shared/vendor/reselect.js</code>.</p>
 <pre>
 The MIT License (MIT)
 
 Copyright (c) 2015-2016 Reselect Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights