diff options
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/LICENSE-logos.txt | 2 | ||||
| -rwxr-xr-x | doc/LICENSE-source.txt | 4 | ||||
| -rwxr-xr-x | doc/contributions.txt | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/doc/LICENSE-logos.txt b/doc/LICENSE-logos.txt index e63c48e542..66f8745f4f 100755 --- 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 100755 --- 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, diff --git a/doc/contributions.txt b/doc/contributions.txt index 3d8da14029..9b31e5032a 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,9 +185,11 @@ Ansariel Hiller BUG-3764 STORM-1984 STORM-1979 + STORM-2083 MAINT-5533 + STORM-2094 MAINT-5756 - MAINT-2199 + MAINT-4677 Aralara Rajal Arare Chantilly CHUIBUG-191 @@ -319,6 +321,8 @@ Cinder Roxley BUG-8786 OPEN-185 OPEN-282 + OPEN-292 + OPEN-297 STORM-1703 STORM-1948 STORM-1831 @@ -726,6 +730,12 @@ Jonathan Yap STORM-2030 STORM-2034 STORM-2018 + STORM-2082 + STORM-2086 + STORM-2085 + STORM-2088 + STORM-2094 + STORM-2099 Kadah Coba STORM-1060 STORM-1843 @@ -1007,6 +1017,7 @@ Nicky Dasmijn STORM-1937 OPEN-187 STORM-2010 + STORM-2082 Nicky Perian OPEN-1 STORM-1087 @@ -1249,6 +1260,8 @@ Sovereign Engineer OPEN-217 OPEN-295 MAINT-6107 + STORM-2107 + MAINT-6218 SpacedOut Frye VWR-34 VWR-45 |