From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 2 Mar 2007 21:25:50 +0000 Subject: merge release@58699 beta-1-14-0@58707 -> release --- doc/LICENSE-logos.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'doc') 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/ + -- cgit v1.2.3