Bug 1418130 - add prop-types license and remove activity-stream from list of reselect license users, r?gerv
MozReview-Commit-ID: ENYKMJ6iq5W
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -143,16 +143,17 @@
<li><a href="about:license#ordered-float">ordered-float License</a></li>
<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#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#react-virtualized">React Virtualized License</a></li>
<li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
@@ -5331,16 +5332,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
@@ -5647,18 +5680,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