Mercurial > hg > release > icedtea7-forest-2.4 > hotspot

changeset 5087:f1a5b7cc078f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Fri, 20 Dec 2013 14:13:38 -0800
parents 89b9bdf85398 (diff) cf4110c35afb (current diff)
children 408028d410e3
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 19 09:32:29 2013 -0800
+++ b/.hgtags	Fri Dec 20 14:13:38 2013 -0800
@@ -606,3 +606,5 @@
 1f11dff734af98f5bf11d4fceeda221ab1416971 jdk7u51-b11
 dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u51-b12
 6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
+ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
--- a/make/hotspot_version	Thu Dec 19 09:32:29 2013 -0800
+++ b/make/hotspot_version	Fri Dec 20 14:13:38 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