[cfe-commits] [libclc] r151129 - in /libclc/trunk: LICENSE.TXT www/index.html

Tue Feb 21 20:47:39 PST 2012

Author: pcc
Date: Tue Feb 21 22:47:39 2012
New Revision: 151129

URL: http://llvm.org/viewvc/llvm-project?rev=151129&view=rev
Log:
Switch to BSD/MIT dual license.

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

Modified: libclc/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/LICENSE.TXT?rev=151129&r1=151128&r2=151129&view=diff
==============================================================================

--- libclc/trunk/LICENSE.TXT (original)
+++ libclc/trunk/LICENSE.TXT Tue Feb 21 22:47:39 2012
@@ -1,4 +1,17 @@
-Copyright (c) 2011 by the contributors listed in CREDITS.TXT
+==============================================================================
+libclc License
+==============================================================================
+
+The libclc 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.
+
+==============================================================================
+
+Copyright (c) 2011-2012 by the contributors listed in CREDITS.TXT
 
 All rights reserved.
 
@@ -27,3 +40,25 @@
 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 WITH THE
 SOFTWARE.
+
+==============================================================================
+
+Copyright (c) 2011-2012 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: libclc/trunk/www/index.html
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/www/index.html?rev=151129&r1=151128&r2=151129&view=diff
==============================================================================
--- libclc/trunk/www/index.html (original)
+++ libclc/trunk/www/index.html Tue Feb 21 22:47:39 2012
@@ -5,7 +5,7 @@
 <body>
 <h1>libclc</h1>
 <p>
-libclc is an open source, BSD licensed
+libclc is an open source, BSD/MIT dual licensed
 implementation of the library requirements of the
 OpenCL C programming language, as specified by the <a
 href="http://www.khronos.org/registry/cl/specs/opencl-1.1.pdf">OpenCL



