changeset 5088:408028d410e3 jdk7u55-b02

Merge
author asaha
date Fri, 20 Dec 2013 21:30:47 -0800
parents f1a5b7cc078f (diff) 208dbfe8ac03 (current diff)
children f80814d92860
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Dec 20 18:52:58 2013 -0800
+++ b/.hgtags	Fri Dec 20 21:30:47 2013 -0800
@@ -607,3 +607,5 @@
 dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
 6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
 cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
+ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
--- a/make/hotspot_version	Fri Dec 20 18:52:58 2013 -0800
+++ b/make/hotspot_version	Fri Dec 20 21:30:47 2013 -0800
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2013
 
 HS_MAJOR_VER=24
-HS_MINOR_VER=51
-HS_BUILD_NUMBER=03
+HS_MINOR_VER=55
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7