X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=LICENSE.TXT;h=84090c07a54f2ce947807c78e1cd02d6606d44cf;hp=ec389f31766c2cdc0059f689632d810fb5612ae2;hb=18a86c95fc36b5f622e8dc87f71252de37a1ed44;hpb=7acfa0b51fad4d9429138aaa75e2b4acddac5199

diff --git a/LICENSE.TXT b/LICENSE.TXT
index ec389f31766..84090c07a54 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -4,8 +4,8 @@ LLVM Release License
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2003, University of Illinois at Urbana-Champaign.  All rights
-reserved.
+Copyright (c) 2003-2015 University of Illinois at Urbana-Champaign.
+All rights reserved.
 
 Developed by:
 
@@ -13,7 +13,7 @@ Developed by:
 
     University of Illinois at Urbana-Champaign
 
-    http://llvm.cs.uiuc.edu
+    http://llvm.org
 
 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
@@ -49,3 +49,22 @@ 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.
 This file will describe the copyrights, license, and restrictions which apply
 to that code.
+
+The disclaimer of warranty in the University of Illinois Open Source License
+applies to all code in the LLVM Distribution, and nothing in any of the
+other licenses gives permission to use the names of the LLVM Team or the
+University of Illinois to endorse or promote products derived from this
+Software.
+
+The following pieces of software have additional or alternate copyrights,
+licenses, and/or restrictions:
+
+Program             Directory
+-------             ---------
+Autoconf            llvm/autoconf
+                    llvm/projects/ModuleMaker/autoconf
+Google Test         llvm/utils/unittest/googletest
+OpenBSD regex       llvm/lib/Support/{reg*, COPYRIGHT.regex}
+pyyaml tests        llvm/test/YAMLParser/{*.data, LICENSE.TXT}
+ARM contributions   llvm/lib/Target/ARM/LICENSE.TXT
+md5 contributions   llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h