changeset 1135:7f0a1578e4a1

8044749: Resolve autoconf and other merge issue from 8u20 to 8u25 Reviewed-by: katleman
author asaha
date Tue, 03 Jun 2014 21:41:01 -0700
parents 34160d2c17a5
children 5b1bcbb97c05
files common/autoconf/generated-configure.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Thu May 29 10:50:00 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Jun 03 21:41:01 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=1397150809
+DATE_WHEN_GENERATED=1401397653
 
 ###############################################################################
 #