# HG changeset patch # User trims # Date 1242229246 25200 # Node ID 07c1c01e031513bfe6a7d17c6cf30d2752824ae9 # Parent 7e1dbef5101158b419ad06ccef3eaaf33f6616ca# Parent cf71f149d7aeb403e460fa8757d8a1f57f756d53 Merge diff -r cf71f149d7ae -r 07c1c01e0315 .hgtags --- a/.hgtags Tue May 12 15:55:56 2009 -0700 +++ b/.hgtags Wed May 13 08:40:46 2009 -0700 @@ -31,3 +31,4 @@ fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54 f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55 a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56 +f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57 diff -r cf71f149d7ae -r 07c1c01e0315 make/hotspot_version --- a/make/hotspot_version Tue May 12 15:55:56 2009 -0700 +++ b/make/hotspot_version Wed May 13 08:40:46 2009 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=16 HS_MINOR_VER=0 -HS_BUILD_NUMBER=02 +HS_BUILD_NUMBER=03 JDK_MAJOR_VER=1 JDK_MINOR_VER=7