diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2009-01-08 00:05:06 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2009-01-08 00:05:06 +0000 |
| commit | e3cf284388e7c8a4c0755ba9e689f6a6264a5a26 (patch) | |
| tree | 38a99c1d7e0d30ee86f6e44ee2d2cfb5067eda31 /indra/test/test_llmanifest.py | |
| parent | b96d890c44c347bdc0d0109f0a2e3998233a4c5c (diff) | |
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
Diffstat (limited to 'indra/test/test_llmanifest.py')
| -rw-r--r-- | indra/test/test_llmanifest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/test/test_llmanifest.py b/indra/test/test_llmanifest.py index 78159c98f8..e645c8891b 100644 --- a/indra/test/test_llmanifest.py +++ b/indra/test/test_llmanifest.py @@ -6,7 +6,7 @@ $LicenseInfo:firstyear=2006&license=viewergpl$ -Copyright (c) 2006-2007, Linden Research, Inc. +Copyright (c) 2006-2009, Linden Research, Inc. Second Life Viewer Source Code The source code in this file ("Source Code") is provided by Linden Lab @@ -14,12 +14,13 @@ to you under the terms of the GNU General Public License, version 2.0 ("GPL"), 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/GPL-license.txt in this distribution, or -online at http://secondlife.com/developers/opensource/gplv2 +online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 There are special exceptions to the terms and conditions of the GPL as it is applied to this Source Code. View the full text of the exception in the file doc/FLOSS-exception.txt in this software distribution, or -online at http://secondlife.com/developers/opensource/flossexception +online at +http://secondlifegrid.net/programs/open_source/licensing/flossexception By copying, modifying or distributing this software, you acknowledge that you have read and understood your obligations described above, |