8044749: Resolve autoconf and other merge issue from 8u20 to 8u25 jdk8u25-b01

Wed, 04 Jun 2014 12:03:31 -0700

author
asaha
date
Wed, 04 Jun 2014 12:03:31 -0700
changeset 1098
c4cfb4376f59
parent 1097
5b1bcbb97c05
child 1099
81be07dde0b4
child 1100
75f6721586ae

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

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Wed Jun 04 09:16:26 2014 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Jun 04 12:03:31 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=1401397653
     1.8 +DATE_WHEN_GENERATED=1401908461
     1.9  
    1.10  ###############################################################################
    1.11  #

mercurial