Mercurial > hg > graal-jvmci-8
diff THIRD_PARTY_README @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | c18cbe5936b8 |
children | 1aa57c62d0e4 |
line wrap: on
line diff
--- a/THIRD_PARTY_README Mon Nov 29 18:32:30 2010 +0100 +++ b/THIRD_PARTY_README Tue Nov 30 14:53:30 2010 +0100 @@ -1126,7 +1126,7 @@ %% This notice is provided with respect to Fast Infoset, which may be included with this software: * Fast Infoset ver. 0.1 software ("Software") * -* Copyright, 2004-2005 Sun Microsystems, Inc. All Rights Reserved. +* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. * * Software is licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. You may @@ -1139,9 +1139,9 @@ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations. * -* Sun supports and benefits from the global community of open source +* Oracle supports and benefits from the global community of open source * developers, and thanks the community for its important contributions and -* open standards-based technology, which Sun has adopted into many of its +* open standards-based technology, which Oracle has adopted into many of its * products. * * Please note that portions of Software may be provided with notices and