diff --git a/toolkit/content/license.html b/toolkit/content/license.html index bb53b67f9a1d..a1c9abb121f3 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -104,6 +104,7 @@
This license applies to parts of the code in:
and also some files in these directories:
-Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +Copyright (c) 2006-2016 The Chromium Authors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -3558,6 +3561,37 @@ Chiyoda-ku, Tokyo 101-0047, Japan.
+JSMN License
+ +This license applies to files in the directories + browser/extensions/mortar/json/. +
+ ++Copyright (c) 2010 Serge A. Zaitsev +Copyright (c) 2015 Andreas Gal + +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. ++ +
+jemalloc License
This license applies to files in the directories @@ -3670,6 +3704,12 @@ SUCH DAMAGE.
and also some files in these directories:
+ +Copyright 2005-2008 The Khronos Group Inc. All Rights Reserved.