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

Tue, 03 Jun 2014 21:41:01 -0700

author
asaha
date
Tue, 03 Jun 2014 21:41:01 -0700
changeset 1096
7f0a1578e4a1
parent 1095
34160d2c17a5
child 1097
5b1bcbb97c05

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	Thu May 29 10:50:00 2014 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue Jun 03 21:41:01 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=1397150809
     1.8 +DATE_WHEN_GENERATED=1401397653
     1.9  
    1.10  ###############################################################################
    1.11  #

mercurial