[llvm-commits] [llvm] r61708 - in /llvm/trunk: LICENSE.TXT utils/unittest/googletest/COPYING utils/unittest/googletest/LICENSE.TXT utils/unittest/googletest/README.LLVM

[Misha Brukman]

Author: brukman
Date: Mon Jan  5 11:42:15 2009
New Revision: 61708

URL: http://llvm.org/viewvc/llvm-project?rev=61708&view=rev
Log:
Renamed Google Test license file from COPYING to LICENSE.TXT to match LLVM
conventions, per John Criswell.

Added:
    llvm/trunk/utils/unittest/googletest/LICENSE.TXT
      - copied unchanged from r61593, llvm/trunk/utils/unittest/googletest/COPYING
Removed:
    llvm/trunk/utils/unittest/googletest/COPYING
Modified:
    llvm/trunk/LICENSE.TXT
    llvm/trunk/utils/unittest/googletest/README.LLVM

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

==============================================================================
--- llvm/trunk/LICENSE.TXT (original)
+++ llvm/trunk/LICENSE.TXT Mon Jan  5 11:42:15 2009
@@ -66,4 +66,4 @@
                     llvm/projects/ModuleMaker/autoconf
                     llvm/projects/sample/autoconf
 CellSPU backend     llvm/lib/Target/CellSPU/README.txt
-Google Test         llvm/utils/unittest/googletest/COPYING
+Google Test         llvm/utils/unittest/googletest

Removed: llvm/trunk/utils/unittest/googletest/COPYING
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/COPYING?rev=61707&view=auto

==============================================================================
--- llvm/trunk/utils/unittest/googletest/COPYING (original)
+++ llvm/trunk/utils/unittest/googletest/COPYING (removed)
@@ -1,28 +0,0 @@
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: llvm/trunk/utils/unittest/googletest/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/README.LLVM?rev=61708&r1=61707&r2=61708&view=diff

==============================================================================
--- llvm/trunk/utils/unittest/googletest/README.LLVM (original)
+++ llvm/trunk/utils/unittest/googletest/README.LLVM Mon Jan  5 11:42:15 2009
@@ -23,4 +23,4 @@
 
 $ rm -f gtest-all.cc gtest_main.cc
 
-For the license, see the file COPYING in this directory.
+$ mv COPYING LICENSE.TXT