# HG changeset patch # User trims # Date 1241837432 25200 # Node ID 7e1dbef5101158b419ad06ccef3eaaf33f6616ca # Parent fede134842ab1710a57955b8a3c69708670c3bcf# Parent 622212a69394d53de1c0c0603a17396e8e028199 Merge diff -r 622212a69394 -r 7e1dbef51011 .hgtags --- a/.hgtags Fri May 08 15:20:10 2009 -0700 +++ b/.hgtags Fri May 08 19:50:32 2009 -0700 @@ -31,3 +31,4 @@ fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54 f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55 a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56 +f4cbf78110c726919f46b59a3b054c54c7e889b4 jdk7-b57 diff -r 622212a69394 -r 7e1dbef51011 make/hotspot_version --- a/make/hotspot_version Fri May 08 15:20:10 2009 -0700 +++ b/make/hotspot_version Fri May 08 19:50:32 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