changeset 8725:9102c4111564

Merge
author jprovino
date Thu, 14 Mar 2013 10:37:23 -0400
parents 8196357e95b5 (diff) 69ffa4ac9e53 (current diff)
children ed53b50794d7
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 12 00:02:16 2013 -0400
+++ b/.hgtags	Thu Mar 14 10:37:23 2013 -0400
@@ -320,3 +320,5 @@
 555ec35a250783110aa070dbc8a8603f6cabe41f hs25-b20
 6691814929b606fe0e7954fd6e485dd876505c83 jdk8-b79
 df5396524152118535c36da5801d828b560d19a2 hs25-b21
+4a198b201f3ce84433fa94a3ca65d061473e7c4c jdk8-b80
+dd6350b4abc4a6c19c89dd982cc0e4f3d119885c hs25-b22
--- a/make/hotspot_version	Tue Mar 12 00:02:16 2013 -0400
+++ b/make/hotspot_version	Thu Mar 14 10:37:23 2013 -0400
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=22
+HS_BUILD_NUMBER=23
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8