Merge jdk8u5-b06

Fri, 24 Jan 2014 18:48:18 -0800

author
asaha
date
Fri, 24 Jan 2014 18:48:18 -0800
changeset 1004
75cdae18810a
parent 1003
c31d191f56ac
parent 945
4f8fa4724c14
child 1005
f990906fc6b7

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Jan 23 14:41:29 2014 -0800
     1.2 +++ b/.hgtags	Fri Jan 24 18:48:18 2014 -0800
     1.3 @@ -247,6 +247,7 @@
     1.4  ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123
     1.5  790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
     1.6  790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
     1.7 +9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
     1.8  c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
     1.9  6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
    1.10  794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
     2.1 --- a/common/autoconf/spec.gmk.in	Thu Jan 23 14:41:29 2014 -0800
     2.2 +++ b/common/autoconf/spec.gmk.in	Fri Jan 24 18:48:18 2014 -0800
     2.3 @@ -170,7 +170,7 @@
     2.4  COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
     2.5  # These variables need to be generated here so that MILESTONE and
     2.6  # JDK_BUILD_NUMBER can be overridden on the make command line.
     2.7 -ifeq ($(MILESTONE),)
     2.8 +ifeq ($(MILESTONE), fcs)
     2.9    RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
    2.10  else
    2.11    RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)

mercurial