[libunwind] r296364 - Merging r296358 and r296359:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Mon Feb 27 12:03:07 2017
New Revision: 296364

URL: http://llvm.org/viewvc/llvm-project?rev=296364&view=rev
Log:
Merging r296358 and r296359:
------------------------------------------------------------------------
r296358 | aadg | 2017-02-27 09:33:20 -0800 (Mon, 27 Feb 2017) | 8 lines

Add libcxxabi's LICENSE.TXT to libunwind.

When libunwind was spinned off libcxxabi, most file were copied from
libcxxabi to libunwind.  However, libc++abi's toplevel LICENSE.TXT was
forgotten in the copying. It's considered a good practice to have the
license file at the root of the project, and making linunwind a separate
project was not supposed to change its licensing. Besides, several
header files refer to the LICENSE.TXT, so copy the one from libc++abi.
------------------------------------------------------------------------

------------------------------------------------------------------------
r296359 | aadg | 2017-02-27 09:47:58 -0800 (Mon, 27 Feb 2017) | 1 line

Fix the project name in the license file.
------------------------------------------------------------------------

Added:
    libunwind/branches/release_40/LICENSE.TXT
      - copied, changed from r296358, libunwind/trunk/LICENSE.TXT
Modified:
    libunwind/branches/release_40/   (props changed)

Propchange: libunwind/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 12:03:07 2017
@@ -1 +1 @@
-/libunwind/trunk:292723
+/libunwind/trunk:292723,296358-296359

Copied: libunwind/branches/release_40/LICENSE.TXT (from r296358, libunwind/trunk/LICENSE.TXT)
URL: http://llvm.org/viewvc/llvm-project/libunwind/branches/release_40/LICENSE.TXT?p2=libunwind/branches/release_40/LICENSE.TXT&p1=libunwind/trunk/LICENSE.TXT&r1=296358&r2=296364&rev=296364&view=diff
==============================================================================
--- libunwind/trunk/LICENSE.TXT (original)
+++ libunwind/branches/release_40/LICENSE.TXT Mon Feb 27 12:03:07 2017
@@ -1,8 +1,8 @@
 ==============================================================================
-libc++abi License
+libunwind License
 ==============================================================================
 
-The libc++abi library is dual licensed under both the University of Illinois
+The libunwind 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.