Mon, 13 Sep 2010 07:38:10 -0700
Merge
1.1 --- a/.hgtags Sat Sep 11 08:18:31 2010 +0200 1.2 +++ b/.hgtags Mon Sep 13 07:38:10 2010 -0700 1.3 @@ -114,4 +114,6 @@ 1.4 1b81ca701fa5fc30adc4cfdaa4bdd153df5e6c86 jdk7-b106 1.5 cc3fdfeb54b049f18edcf3463e6ab051d0b7b609 hs19-b05 1.6 688a538aa65412178286ae2a6b0c00b6711e121b hs19-b06 1.7 +bf496cbe9b74dda5975a1559da7ecfdd313e509e jdk7-b107 1.8 0000000000000000000000000000000000000000 hs19-b06 1.9 +6c43216df13513a0f96532aa06f213066c49e27b hs19-b06
2.1 --- a/make/hotspot_version Sat Sep 11 08:18:31 2010 +0200 2.2 +++ b/make/hotspot_version Mon Sep 13 07:38:10 2010 -0700 2.3 @@ -33,9 +33,9 @@ 2.4 # Don't put quotes (fail windows build). 2.5 HOTSPOT_VM_COPYRIGHT=Copyright 2010 2.6 2.7 -HS_MAJOR_VER=19 2.8 +HS_MAJOR_VER=20 2.9 HS_MINOR_VER=0 2.10 -HS_BUILD_NUMBER=06 2.11 +HS_BUILD_NUMBER=01 2.12 2.13 JDK_MAJOR_VER=1 2.14 JDK_MINOR_VER=7