summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-10-08 08:15:08 +0200
committerGitHub <noreply@github.com>2018-10-08 08:15:08 +0200
commit7e96154b878e6e08ccc1220ad252aeac312d4753 (patch)
tree7a1f7869bdbe1c66652d1af8a21d2182ee4db1f1 /toolkit
parent0357bf9fb69f745274b36c4e3649fe5ba6edbad9 (diff)
parenta08ef72265f270f7b0925a0ee9f5c6cee4187c6d (diff)
downloadUXP-7e96154b878e6e08ccc1220ad252aeac312d4753.tar
UXP-7e96154b878e6e08ccc1220ad252aeac312d4753.tar.gz
UXP-7e96154b878e6e08ccc1220ad252aeac312d4753.tar.lz
UXP-7e96154b878e6e08ccc1220ad252aeac312d4753.tar.xz
UXP-7e96154b878e6e08ccc1220ad252aeac312d4753.zip
Merge pull request #818 from trav90/mfbt-work
Add mozilla::Span
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/content/license.html33
1 files changed, 33 insertions, 0 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index a348fdfa6..7221a8ae2 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -97,6 +97,7 @@
<li><a href="about:license#gears">Google Gears License</a></li>
<li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li>
<li><a href="about:license#vp8">Google VP8 License</a></li>
+ <li><a href="about:license#gsl">GSL License</a></li>
<li><a href="about:license#gyp">gyp License</a></li>
<li><a href="about:license#halloc">halloc License</a></li>
<li><a href="about:license#harfbuzz">HarfBuzz License</a></li>
@@ -3285,6 +3286,38 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<hr>
+ <h1><a id="gsl"></a>GSL License</h1>
+
+ <p>This license applies to <span class="path">mfbt/Span.h</span> and
+ <span class="path">mfbt/tests/gtest/TestSpan.cpp</span>.</p>
+ <!-- https://github.com/Microsoft/GSL/blob/3819df6e378ffccf0e29465afe99c3b324c2aa70/LICENSE -->
+<pre>
+Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+
+This code is licensed under the MIT License (MIT).
+
+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="gyp"></a>gyp License</h1>
<p>This license applies to certain files in the directory