From 42f049dbecbfdfaf656e1b7bf597d069cfeeeb7d Mon Sep 17 00:00:00 2001 From: Hal Finkel Date: Mon, 26 May 2014 07:13:39 -0500 Subject: Update license file to be consistent with the README text --- CREDITS.TXT | 14 ++++++++++++++ LICENSE.TXT | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 CREDITS.TXT diff --git a/CREDITS.TXT b/CREDITS.TXT new file mode 100644 index 0000000..431a146 --- /dev/null +++ b/CREDITS.TXT @@ -0,0 +1,14 @@ +This file is a partial list of people who have contributed to the libflangrt +project. If you have contributed a patch or made some other contribution to +libflangrt, please submit a patch to this file to add yourself, and it will be +done! + +The list is sorted by surname and formatted to allow easy grepping and +beautification by scripts. The fields are: name (N), email (E), web-address +(W), PGP key ID and fingerprint (P), description (D), and snail-mail address +(S). + +N: Alex L. +E: arphaman@gmail.com +D: Architect and primary author of libflangrt + diff --git a/LICENSE.TXT b/LICENSE.TXT index 90ca2e9..30951e9 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,10 +1,21 @@ ============================================================================== -LLVM Release License +libflangrt License ============================================================================== + +The libflangrt 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) 2011 University of Illinois at Urbana-Champaign. +Copyright (c) 2009-2014 by the contributors listed in CREDITS.TXT + All rights reserved. Developed by: @@ -42,6 +53,30 @@ 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) 2009-2014 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. + +============================================================================== +Copyrights and Licenses for Third Party Software Distributed with LLVM: ============================================================================== 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. -- cgit v1.2.1