Mercurial > hg > graal-jvmci-8
changeset 920:a774e1abbe85
Merge
| author | trims |
|---|---|
| date | Fri, 21 Aug 2009 20:39:41 -0700 |
| parents | a05ea7791ee3 (diff) 585222cadf79 (current diff) |
| children | aba04734b61e aafa4232dfd7 75e30968ebe1 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Aug 19 15:46:22 2009 -0700 +++ b/.hgtags Fri Aug 21 20:39:41 2009 -0700 @@ -44,3 +44,4 @@ 18f526145aea355a9320b724373386fc2170f183 jdk7-b67 d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68 54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69 +0632c3e615a315ff11e2ab1d64f4d82ff9853461 jdk7-b70
--- a/THIRD_PARTY_README Wed Aug 19 15:46:22 2009 -0700 +++ b/THIRD_PARTY_README Fri Aug 21 20:39:41 2009 -0700 @@ -32,7 +32,7 @@ --- end of LICENSE file --- %% This notice is provided with respect to ASM, which may be included with this software: -Copyright (c) 2000-2005 INRIA, France Telecom +Copyright (c) 2000-2007 INRIA, France Telecom All rights reserved. Redistribution and use in source and binary forms, with or without
--- a/make/hotspot_version Wed Aug 19 15:46:22 2009 -0700 +++ b/make/hotspot_version Fri Aug 21 20:39:41 2009 -0700 @@ -33,9 +33,9 @@ # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2009 -HS_MAJOR_VER=16 +HS_MAJOR_VER=17 HS_MINOR_VER=0 -HS_BUILD_NUMBER=08 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=7