changeset 1601:4bffc502a23f

Merge
author aefimov
date Tue, 13 Oct 2015 17:58:26 +0300
parents 832bf492eccf a482cd45f31d
children e6361dcd087e
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Sep 28 15:40:05 2015 -0700
+++ b/.hgtags	Tue Oct 13 17:58:26 2015 +0300
@@ -478,6 +478,7 @@
 0787e2c3160eeaea4183bcc9e3ffbd7adbe0d345 jdk8u65-b14
 3b1c03ea5649b2e317f327c0b4d949d49504a591 jdk8u65-b15
 170b44557b27ba97d12f45e2b94b7709a1bf8b54 jdk8u65-b16
+c684352da3e3c0df6a219796019142748d593fe5 jdk8u65-b17
 01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
 0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
 dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
@@ -491,3 +492,4 @@
 b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14
 d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
 5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
+6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
--- a/common/autoconf/generated-configure.sh	Mon Sep 28 15:40:05 2015 -0700
+++ b/common/autoconf/generated-configure.sh	Tue Oct 13 17:58:26 2015 +0300
@@ -3879,7 +3879,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1433258489
+DATE_WHEN_GENERATED=1444076935
 
 ###############################################################################
 #
@@ -11295,7 +11295,7 @@
   fi
 
 
-# The cooked update version used to encode trailing letters in the update
+  # The cooked update version used to encode trailing letters in the update
   # version into a trailing number. That is no longer needed, but need to
   # keep the format in 8u for compatibility.
   COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"