# HG changeset patch # User jcoomes # Date 1241110400 25200 # Node ID 61c5604c8422a227dc279a9da037368be1509e20 # Parent f4cbf78110c726919f46b59a3b054c54c7e889b4# Parent c8379544879a089b68e50d1bc26b016ea4cd24dc Merge diff -r c8379544879a -r 61c5604c8422 .hgtags --- a/.hgtags Wed Apr 29 17:30:20 2009 -0700 +++ b/.hgtags Thu Apr 30 09:53:20 2009 -0700 @@ -30,3 +30,4 @@ 032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53 fafab5d5349c7c066d677538db67a1ee0fb33bd2 jdk7-b54 f8e839c086152da70d6ec5913ba6f9f509282e8d jdk7-b55 +a3fd9e40ff2e854f6169eb6d09d491a28634d04f jdk7-b56 diff -r c8379544879a -r 61c5604c8422 make/hotspot_version --- a/make/hotspot_version Wed Apr 29 17:30:20 2009 -0700 +++ b/make/hotspot_version Thu Apr 30 09:53:20 2009 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=16 HS_MINOR_VER=0 -HS_BUILD_NUMBER=01 +HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=7