OpenJDK / bsd-port / jdk9 / hotspot
changeset 1696:8a8a7a014a12
Merge
| author | kamg |
|---|---|
| date | Mon, 13 Sep 2010 07:38:10 -0700 |
| parents | 30f67acf635d 93193e632121 |
| children | 97fbf5beff7b 6cde0ed1b568 728a287f6c20 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Sep 11 08:18:31 2010 +0200 +++ b/.hgtags Mon Sep 13 07:38:10 2010 -0700 @@ -114,4 +114,6 @@ 1b81ca701fa5fc30adc4cfdaa4bdd153df5e6c86 jdk7-b106 cc3fdfeb54b049f18edcf3463e6ab051d0b7b609 hs19-b05 688a538aa65412178286ae2a6b0c00b6711e121b hs19-b06 +bf496cbe9b74dda5975a1559da7ecfdd313e509e jdk7-b107 0000000000000000000000000000000000000000 hs19-b06 +6c43216df13513a0f96532aa06f213066c49e27b hs19-b06
--- a/make/hotspot_version Sat Sep 11 08:18:31 2010 +0200 +++ b/make/hotspot_version Mon Sep 13 07:38:10 2010 -0700 @@ -33,9 +33,9 @@ # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2010 -HS_MAJOR_VER=19 +HS_MAJOR_VER=20 HS_MINOR_VER=0 -HS_BUILD_NUMBER=06 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=7