8048270: Resolve autoconf and other merge issue from 8u20-b20 to 8u25

Thu, 26 Jun 2014 11:42:56 -0700

author
asaha
date
Thu, 26 Jun 2014 11:42:56 -0700
changeset 1109
8ade97377608
parent 1108
67d1495a24ef
child 1110
6de13ae93be2

8048270: Resolve autoconf and other merge issue from 8u20-b20 to 8u25
Reviewed-by: katleman

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Thu Jun 26 08:27:47 2014 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Thu Jun 26 11:42:56 2014 -0700
     1.3 @@ -3868,7 +3868,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1401908461
     1.8 +DATE_WHEN_GENERATED=1403797630
     1.9  
    1.10  ###############################################################################
    1.11  #

mercurial