Bug 724531 - Import ICU library into the mozilla tree. r=gerv
authorNorbert Lindenberg <mozilladev@lindenbergsoftware.com>
Fri, 01 Mar 2013 20:52:58 -0800
changeset 134044 1dde77969a45556779c7547bc892c4adbfd42348
parent 134043 779b7ec8c9ecee3fa60668ba69d447be58f584f0
child 134045 7810fb353f1a950e628d38e81b65b8839a0a78b8
push idunknown
push userunknown
push dateunknown
reviewersgerv
bugs724531
milestone22.0a1
Bug 724531 - Import ICU library into the mozilla tree. r=gerv
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -103,16 +103,17 @@
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
       <li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#sctp">SCTP Licenses</a></li>
       <li><a href="about:license#skia">Skia License</a></li>
       <li><a href="about:license#snappy">Snappy License</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
       <li><a href="about:license#suitable">Suitable Systems License</a></li>
       <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#webrtc">WebRTC License</a></li>
       <li><a href="about:license#xiph">Xiph.org Foundation License</a></li>
     </ul>
 
@@ -1680,25 +1681,26 @@ FITNESS FOR A PARTICULAR PURPOSE.  THE S
 ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
 PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 </pre>
 
     <hr>
 
     <h1><a id="icu"></a>ICU License</h1>
 
-    <p>This license applies to some code in the
+    <p>This license applies to files in the <span class="path">intl/icu</span>
+    directory and to some code in the
     <span class="path">gfx/thebes</span> directory.</p>
 
 <pre>
 ICU License - ICU 1.8.1 and later
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright (c) 1995-2009 International Business Machines Corporation and
+Copyright (c) 1995-2012 International Business Machines Corporation and
 others
 
 All rights reserved.
 
 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, and/or sell
@@ -2950,16 +2952,59 @@ Except as contained in this notice, the 
 shall not be used in advertising or otherwise to promote the 
 sale, use or other dealings in this Software without written 
 authorization from SunSoft Inc. 
 </pre>
 
 
     <hr>
 
+    <h1><a id="unicode"></a>Unicode License</h1>
+
+    <p>This license applies to certain files in the directories
+    <span class="path">intl/icu</span> and <span class="path">js/src/vm</span>.
+    </p>
+
+<pre>
+Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed
+under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the Unicode data files and any associated documentation (the
+"Data Files") or Unicode software and any associated documentation (the
+"Software") to deal in the Data Files or Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, and/or sell copies of the Data Files or Software,
+and to permit persons to whom the Data Files or Software are furnished
+to do so, provided that (a) the above copyright notice(s) and this
+permission notice appear with all copies of the Data Files or Software,
+(b) both the above copyright notice(s) and this permission notice appear
+in associated documentation, and (c) there is clear notice in each
+modified Data File or in the Software as well as in the documentation
+associated with the Data File(s) or Software that the data or software
+has been modified.
+
+THE DATA FILES AND SOFTWARE ARE 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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL 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 THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.</pre>
+
+
+    <hr>
+
     <h1><a id="ucal"></a>University of California License</h1>
 
     <p>This license applies to the following files or, in the case of
     directories, certain files in those directories:</p>
     
     <ul>
       <li class="path">dbm/</li>
       <li class="path">db/mork/src/morkQuickSort.cpp</li>