[llvm-branch-commits] [llvm-branch] r278688 - Merging r278558:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug 15 12:48:44 2016
New Revision: 278688

URL: http://llvm.org/viewvc/llvm-project?rev=278688&view=rev
Log:
Merging r278558:
------------------------------------------------------------------------
r278558 | cbieneman | 2016-08-12 13:11:03 -0700 (Fri, 12 Aug 2016) | 3 lines

Remove autoconf references from LICENSE.TXT

Since we don't actually have the autoconf subdirectories anymore, we don't need this reference here.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_39/   (props changed)
    llvm/branches/release_39/LICENSE.TXT

Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 15 12:48:44 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,277773,278002,278086,278133,278157,278370,278413,278569,278573,278584
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276712,276740,276823,276956,276980,277093,277114,277135,277371,277399,277500,277504,277625,277691,277693,277773,278002,278086,278133,278157,278370,278413,278558,278569,278573,278584

Modified: llvm/branches/release_39/LICENSE.TXT
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/LICENSE.TXT?rev=278688&r1=278687&r2=278688&view=diff
==============================================================================
--- llvm/branches/release_39/LICENSE.TXT (original)
+++ llvm/branches/release_39/LICENSE.TXT Mon Aug 15 12:48:44 2016
@@ -61,8 +61,6 @@ 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}