diff options
| author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-02-18 23:25:59 +0000 |
|---|---|---|
| committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-02-18 23:25:59 +0000 |
| commit | 1f03bfbb94702b2f08df62308dfc97416880c716 (patch) | |
| tree | 51ea830e4eff52d12dd3870e2c44ba0a721f2a89 /COPYRIGHT.txt | |
| parent | bf7fd8076debc3fe2b23c2c399c5ce13afb3198e (diff) | |
Merged changes between 1.3.2-beta2 and 1.3.2-beta3 into the 1.4 dev 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 23f8b5e..311bfd3 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004 Sun Microsystems, Inc., 4150 Network Circle, Santa +Copyright (c) 2005 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) 2004 Sun Microsystems, Inc., 4150 Network Circle, Santa +Copyright (c) 2005 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 |