[cfe-commits] [libcxx] r119391 - in /libcxx/trunk: LICENSE.TXT www/index.html

[Chris Lattner]

Author: lattner
Date: Tue Nov 16 15:40:19 2010
New Revision: 119391

URL: http://llvm.org/viewvc/llvm-project?rev=119391&view=rev
Log:
libc++ is now dual licensed under both UIUC and MIT licenses.

Modified:
    libcxx/trunk/LICENSE.TXT
    libcxx/trunk/www/index.html

Modified: libcxx/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/LICENSE.TXT?rev=119391&r1=119390&r2=119391&view=diff
==============================================================================
--- libcxx/trunk/LICENSE.TXT (original)
+++ libcxx/trunk/LICENSE.TXT Tue Nov 16 15:40:19 2010
@@ -1,10 +1,21 @@
 ==============================================================================
-LLVM Release License
+libc++ License
 ==============================================================================
+
+The libc++ library is dual licensed under both the University of Illinois
+"BSD-Like" license and the MIT license.  As a user of this code you may choose
+to use it under either license.  As a contributor, you agree to allow your code
+to be used under both.
+
+Full text of the relevant licenses is included below.
+
+==============================================================================
+
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2007-2010 University of Illinois at Urbana-Champaign.
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
 All rights reserved.
 
 Developed by:
@@ -43,20 +54,23 @@
 SOFTWARE.
 
 ==============================================================================
-The LLVM software contains code written by third parties.  Such software will
-have its own individual LICENSE.TXT file in the directory in which it appears.
-This file will describe the copyrights, license, and restrictions which apply
-to that code.
-
-The disclaimer of warranty in the University of Illinois Open Source License
-applies to all code in the LLVM Distribution, and nothing in any of the
-other licenses gives permission to use the names of the LLVM Team or the
-University of Illinois to endorse or promote products derived from this
-Software.
-
-The following pieces of software have additional or alternate copyrights,
-licenses, and/or restrictions:
-
-Program             Directory
--------             ---------
-<none yet>
+
+Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT
+
+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.

Modified: libcxx/trunk/www/index.html
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/index.html?rev=119391&r1=119390&r2=119391&view=diff
==============================================================================
--- libcxx/trunk/www/index.html (original)
+++ libcxx/trunk/www/index.html Tue Nov 16 15:40:19 2010
@@ -38,9 +38,9 @@
   <p>libc++ is a new implementation of the C++ standard library, targeting
      C++0X.</p>
 
-  <p>All of the code in libc++ is available under the standard
-     <a href="http://llvm.org/docs/DeveloperPolicy.html#license">LLVM
-     License</a>, a "BSD-style" license.</p>
+  <p>All of the code in libc++ is <a
+     href="http://llvm.org/docs/DeveloperPolicy.html#license">dual licensed</a>
+     under the MIT license and the UIUC License (a BSD-like license).</p>
 
   <!--=====================================================================-->
   <h2 id="goals">Features and Goals</h2>