# HG changeset patch # User asaha # Date 1401908611 25200 # Node ID c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 # Parent 5b1bcbb97c0556e67b0602751c40983b0f0e1982 8044749: Resolve autoconf and other merge issue from 8u20 to 8u25 Reviewed-by: katleman diff -r 5b1bcbb97c05 -r c4cfb4376f59 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed Jun 04 09:16:26 2014 -0700 +++ b/common/autoconf/generated-configure.sh Wed Jun 04 12:03:31 2014 -0700 @@ -3868,7 +3868,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1401397653 +DATE_WHEN_GENERATED=1401908461 ############################################################################### #