diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 21:25:50 +0000 |
| commit | 4dabd9c0472deb49573fdafef2fa413e59703f19 (patch) | |
| tree | 06c680d6a2047e03838d6548bccd26c7baf9d652 /doc/LICENSE-logos.txt | |
| parent | d4462963c6ba5db2088723bbedc7b60f1184c594 (diff) | |
merge release@58699 beta-1-14-0@58707 -> release
Diffstat (limited to 'doc/LICENSE-logos.txt')
| -rw-r--r-- | doc/LICENSE-logos.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index 53b417cab6..0ca7dfd491 100644 --- a/doc/LICENSE-logos.txt +++ b/doc/LICENSE-logos.txt @@ -6,7 +6,12 @@ Research, Inc. Other trademarks include (but are not limited to): the names Linden and Linden Research, as well as the Linden Lab Hexagon Design and the Second Life Hand Design logos. -Use of logos and trademarks are subject to the Linden Lab trademark -policy, available at: - +The copyrightable materials in this file that are owned by Linden Lab +are "Work" licensed under Creative Commons license Attribution-Share +Alike 2.5 (summarized at +http://creativecommons.org/licenses/by-sa/2.5/ , full text of license +at http://creativecommons.org/licenses/by-sa/2.5/legalcode); provided +however that all trademarks of Linden Lab are subject to the Linden +Lab trademark policy, available at http://secondlife.com/corporate/trademark/ + |