From 58dffe641b4272a6eef4d320c70f800e2efd0d76 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 16 Nov 2010 21:40:19 +0000 Subject: [PATCH] libc++ is now dual licensed under both UIUC and MIT licenses. llvm-svn: 119391 --- libcxx/LICENSE.TXT | 46 ++++++++++++++++++++++++++++--------------- libcxx/www/index.html | 6 +++--- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/libcxx/LICENSE.TXT b/libcxx/LICENSE.TXT index 3aeb625e919f..926f067697ac 100644 --- a/libcxx/LICENSE.TXT +++ b/libcxx/LICENSE.TXT @@ -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 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE 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. +Copyright (c) 2009-2010 by the contributors listed in CREDITS.TXT -The following pieces of software have additional or alternate copyrights, -licenses, and/or restrictions: +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: -Program Directory -------- --------- - +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. diff --git a/libcxx/www/index.html b/libcxx/www/index.html index 38a9d9003e32..cc7d4cde7c31 100644 --- a/libcxx/www/index.html +++ b/libcxx/www/index.html @@ -38,9 +38,9 @@

libc++ is a new implementation of the C++ standard library, targeting C++0X.

-

All of the code in libc++ is available under the standard - LLVM - License, a "BSD-style" license.

+

All of the code in libc++ is dual licensed + under the MIT license and the UIUC License (a BSD-like license).

Features and Goals