Mercurial > hg > icedtea8-forest > hotspot
changeset 879:cd9a224a9202
Merge
author | andrew |
---|---|
date | Fri, 21 Aug 2009 19:43:36 +0100 |
parents | 12b81df6076d (current diff) 0632c3e615a3 (diff) |
children | 468ea732650d |
files | |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 17 13:33:28 2009 +0100 +++ b/.hgtags Fri Aug 21 19:43:36 2009 +0100 @@ -43,3 +43,4 @@ 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66 18f526145aea355a9320b724373386fc2170f183 jdk7-b67 d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68 +54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
--- a/THIRD_PARTY_README Mon Aug 17 13:33:28 2009 +0100 +++ b/THIRD_PARTY_README Fri Aug 21 19:43:36 2009 +0100 @@ -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