Mercurial > hg > openjdk > aarch64-port
changeset 1018:75cdae18810a jdk8u5-b06
Merge
author | asaha |
---|---|
date | Fri, 24 Jan 2014 18:48:18 -0800 |
parents | c31d191f56ac (current diff) 4f8fa4724c14 (diff) |
children | f990906fc6b7 |
files | .hgtags |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 23 14:41:29 2014 -0800 +++ b/.hgtags Fri Jan 24 18:48:18 2014 -0800 @@ -247,6 +247,7 @@ ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125 +9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126 c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01 6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02 794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
--- a/common/autoconf/spec.gmk.in Thu Jan 23 14:41:29 2014 -0800 +++ b/common/autoconf/spec.gmk.in Fri Jan 24 18:48:18 2014 -0800 @@ -170,7 +170,7 @@ COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ # These variables need to be generated here so that MILESTONE and # JDK_BUILD_NUMBER can be overridden on the make command line. -ifeq ($(MILESTONE),) +ifeq ($(MILESTONE), fcs) RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) else RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)