changeset 6968:429994fc0754

Merge
author cjplummer
date Wed, 14 Nov 2012 10:13:51 -0800
parents 3be318ecfae5 (diff) d9a84e246cce (current diff)
children c5d4acbb943d
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Nov 09 09:45:00 2012 -0800
+++ b/.hgtags	Wed Nov 14 10:13:51 2012 -0800
@@ -291,3 +291,5 @@
 dc16fe422c535ecd4e9f80fb814a1bb9704da6f5 hs25-b07
 acabb5c282f59be7e3238920b2ea06b684ab68f7 jdk8-b63
 8cb93eadfb6dcab88d91b8e2cd3e0e07d0ac4048 hs25-b08
+5920f72e799c8133d1066c4a62fa1fafcb729966 jdk8-b64
+b4ee7b773144a88af8b6b92e4384dea82cb948d8 hs25-b09
--- a/make/hotspot_version	Fri Nov 09 09:45:00 2012 -0800
+++ b/make/hotspot_version	Wed Nov 14 10:13:51 2012 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=09
+HS_BUILD_NUMBER=10
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8