changeset 2697:774d24a28d52

Merge
author mchung
date Thu, 08 Sep 2016 17:41:59 -0700
parents 0b50a0d179fd 8fa615724c4f
children 853cab545239
files common/autoconf/generated-configure.sh common/autoconf/platform.m4 make/CompileJavaModules.gmk make/Images.gmk make/common/SetupJavaCompilers.gmk
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Thu Sep 08 21:11:52 2016 +0000
+++ b/.jcheck/conf	Thu Sep 08 17:41:59 2016 -0700
@@ -1,1 +1,4 @@
 project=jdk9
+comments=lax
+tags=lax
+bugids=dup
--- a/common/autoconf/generated-configure.sh	Thu Sep 08 21:11:52 2016 +0000
+++ b/common/autoconf/generated-configure.sh	Thu Sep 08 17:41:59 2016 -0700
@@ -5095,7 +5095,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1472718471
+DATE_WHEN_GENERATED=1473381710
 
 ###############################################################################
 #