diff options
| author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
|---|---|---|
| committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
| commit | 279c29b62e072da39600011b37e2d331fa21c7c1 (patch) | |
| tree | d6c425de568e8b6b952697e4bc2ab4fd749170eb /COPYRIGHT.txt | |
| parent | ed3fe3394103b0eddedde55fcb954079a5b42e8a (diff) | |
Merged changes between root-1_5 and exp-1_4_0-beta3 into dev-1_5 branch
Diffstat (limited to 'COPYRIGHT.txt')
| -rw-r--r-- | COPYRIGHT.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 311bfd3..ddf4763 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,4 +1,4 @@ -Copyright (c) 2005 Sun Microsystems, Inc., 4150 Network Circle, Santa +Copyright (c) 2006 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, U.S.A. All rights reserved. Sun Microsystems, Inc. has intellectual property rights relating to @@ -35,7 +35,7 @@ to entities identified on U.S. export exclusion lists, including, but not limited to, the denied persons and specially designated nationals lists is strictly prohibited. -Copyright (c) 2005 Sun Microsystems, Inc., 4150 Network Circle, Santa +Copyright (c) 2006 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, Etats-Unis. Tous droits r�serv�s. Sun Microsystems, Inc. d�tient les droits de propri�t� intellectuels |