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

changeset 5094:46236fe5d1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 09 Jan 2014 07:55:58 -0800
parents ff8e01218d6c (diff) 208419914859 (current diff)
children 3be3b8a032a5
files .hgtags
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jan 08 14:13:12 2014 -0800
+++ b/.hgtags	Thu Jan 09 07:55:58 2014 -0800
@@ -609,3 +609,7 @@
 6c6a2299029ad02fa2820b8ff8c61c2bbcae799c jdk7u51-b13
 a398ddc79d2310ad37b131cc3794b3cf574f088e jdk7u51-b30
 cf4110c35afb10456d8264c47b7cde1c20150cab jdk7u51-b31
+dee2a38ef6b26534c44c550ef4da2c3146c612c2 jdk7u55-b00
+ac0063b4452bc724e8648e64f4b2d495054bb308 jdk7u55-b01
+408028d410e316a99495c42df0031018890c22fe jdk7u55-b02
+50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03
--- a/make/hotspot_version	Wed Jan 08 14:13:12 2014 -0800
+++ b/make/hotspot_version	Thu Jan 09 07:55:58 2014 -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