[llvm-commits] [test-suite] r164838 - in /test-suite/trunk: LICENSE.TXT MultiSource/Benchmarks/TSVC/LICENSE.TXT MultiSource/Benchmarks/TSVC/license.txt

[Hal Finkel]

Author: hfinkel
Date: Fri Sep 28 14:31:56 2012
New Revision: 164838

URL: http://llvm.org/viewvc/llvm-project?rev=164838&view=rev
Log:
Rename TSVC's license file to LICENSE.TXT and update the master LICENSE.TXT.

Added:
    test-suite/trunk/MultiSource/Benchmarks/TSVC/LICENSE.TXT
      - copied unchanged from r164834, test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt
Removed:
    test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt
Modified:
    test-suite/trunk/LICENSE.TXT

Modified: test-suite/trunk/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/LICENSE.TXT?rev=164838&r1=164837&r2=164838&view=diff
==============================================================================
--- test-suite/trunk/LICENSE.TXT (original)
+++ test-suite/trunk/LICENSE.TXT Fri Sep 28 14:31:56 2012
@@ -101,6 +101,7 @@
 gsm:                llvm-test/MultiSource/Benchmarks/mediabench/gsm
 jpeg:               llvm-test/MultiSource/Benchmarks/mediabench/jpeg
 mpeg2:              llvm-test/MultiSource/Benchmarks/mediabench/mpeg2
+TSVC:               llvm-test/MultiSource/Benchmarks/TSVC
 Dhrystone:          llvm-test/SingleSource/Benchmarks/Dhrystone
 SingleSource Tests: llvm-test/SingleSource/Benchmarks/Misc
                     llvm-test/SingleSource/CustomChecked

Removed: test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt?rev=164837&view=auto
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt (original)
+++ test-suite/trunk/MultiSource/Benchmarks/TSVC/license.txt (removed)
@@ -1,58 +0,0 @@
-Copyright (c) 2011 University of Illinois at Urbana-Champaign.  All rights reserved.
-
-
-
-Developed by: Polaris Research Group
-
-              University of Illinois at Urbana-Champaign
-
-              http://polaris.cs.uiuc.edu
-
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-
-of this software and associated documentation files (the "Software"), to
-
-deal with 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:
-
-  1. Redistributions of source code must retain the above copyright notice,
-
-     this list of conditions and the following disclaimers.
-
-  2. Redistributions in binary form must reproduce the above copyright
-
-     notice, this list of conditions and the following disclaimers in the
-
-     documentation and/or other materials provided with the distribution.
-
-  3. Neither the names of Polaris Research Group, University of Illinois at
-
-     Urbana-Champaign, nor the names of its contributors may be used to endorse
-
-     or promote products derived from this Software without specific prior
-
-     written permission.
-
-
-
-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
-
-CONTRIBUTORS 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
-
-WITH THE SOFTWARE.
-