changeset 1876:9eaf8ba53f3d

Merge
author trims
date Wed, 20 Oct 2010 17:07:25 -0700
parents bdbc48857210 (diff) 4e22405d98d6 (current diff)
children 60ce9dade348
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 19 11:14:52 2010 -0700
+++ b/.hgtags	Wed Oct 20 17:07:25 2010 -0700
@@ -122,4 +122,6 @@
 2f25f2b8de2700a1822463b1bd3d02b5e218018f jdk7-b110
 07b042e13dde4f3479ba9ec55120fcd5e8623323 jdk7-b111
 5511edd5d719f3fc9fdd04879482026a3d2c8652 jdk7-b112
+beef35b96b81129c375d572357fb9548d9020db1 jdk7-b113
+68d6141ea19de3a9ba98ef753f0da41a61f736a0 jdk7-b114
 5511edd5d719f3fc9fdd04879482026a3d2c8652 hs20-b01
--- a/make/hotspot_version	Tue Oct 19 11:14:52 2010 -0700
+++ b/make/hotspot_version	Wed Oct 20 17:07:25 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=20
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7