changeset 2787:8487c835efbf

Merge
author tonyp
date Fri, 28 Oct 2011 12:49:16 -0400
parents dbfcbecbb2dc c9d25d93ddfe
children 6534482ff68a 59519b7d7b9d
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 26 08:44:53 2011 +0200
+++ b/.hgtags	Fri Oct 28 12:49:16 2011 -0400
@@ -191,3 +191,5 @@
 49ed7eacfd16616166ff066493143889741097af jdk8-b08
 7c20d272643f47195478708eff593a9cce40fec4 jdk8-b09
 e4f412d2b75d2c797acff965aa2c420e3d358f09 hs23-b02
+d815de2e85e511b7deab2a83cf80c0224d011da9 jdk8-b10
+4d3850d9d326ac3a9bee2d867727e954322d014e hs23-b03
--- a/make/hotspot_version	Wed Oct 26 08:44:53 2011 +0200
+++ b/make/hotspot_version	Fri Oct 28 12:49:16 2011 -0400
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8