diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-24 09:19:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-24 09:19:53 -0400 |
| commit | c94756d92c7353cb91bfddb5e342f825457e1a7e (patch) | |
| tree | 551cecc1dc94a76fb91f66e9982b2d0c10bfb71a /doc | |
| parent | 075e55c4589b16dd5089075f14f5257654438264 (diff) | |
| parent | 5ed8ec6ca45fcae6a6708e55326010fd8c05d76c (diff) | |
merge up to 3.4.0-release
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/LICENSE-logos.txt | 2 | ||||
| -rw-r--r-- | doc/LICENSE-source.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index e63c48e542..66f8745f4f 100644 --- a/doc/LICENSE-logos.txt +++ b/doc/LICENSE-logos.txt @@ -11,7 +11,7 @@ summary, see http://creativecommons.org/licenses/by-sa/3.0/. Notwithstanding the foregoing, all of Linden Lab's trademarks, including but not limited to the Second Life brand name and Second Life Eye-in-Hand logo, are subject to our trademark policy at -http://secondlife.com/corporate/trademark/. +http://secondlife.com/corporate/brand/trademark/. If you distribute any copies or adaptations of the Second Life viewer artwork or any other works in these files, you must include this Notice diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt index 407402265e..3de5123415 100644 --- a/doc/LICENSE-source.txt +++ b/doc/LICENSE-source.txt @@ -7,7 +7,9 @@ you under the terms of the GNU Lesser General Public License, version 2.1 ("LGPL"), unless you have obtained a separate licensing agreement ("Other License"), formally executed by you and Linden Lab. Terms of the GPL can be found in doc/LGPL-license.txt in this distribution, or -online at http://secondlife.com/developers/opensource/lgplv2_1 +online at + +https://wiki.secondlife.com/wiki/Linden_Lab_Official:GNU_Lesser_General_Public_License,_version_2.1 By copying, modifying or distributing this software, you acknowledge that you have read and understood your obligations described above, |