# HG changeset patch # User twisti # Date 1344646224 25200 # Node ID 4c8f2a12e757e7a808aa85827573e09f75d7459f # Parent ee7edf31f68833a6c4fdcf0299a5c9033a010da3# Parent ef437ea566514316b007cffde265b27b3e6ae6aa Merge diff -r ee7edf31f688 -r 4c8f2a12e757 make/hotspot_version --- a/make/hotspot_version Fri Aug 10 15:50:49 2012 -0700 +++ b/make/hotspot_version Fri Aug 10 17:50:24 2012 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=24 HS_MINOR_VER=0 -HS_BUILD_NUMBER=19 +HS_BUILD_NUMBER=20 JDK_MAJOR_VER=1 JDK_MINOR_VER=8