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/develop.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/develop.py')
| -rwxr-xr-x | indra/develop.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/develop.py b/indra/develop.py index 64a0ecfbd8..67d1049a8a 100755 --- a/indra/develop.py +++ b/indra/develop.py @@ -6,7 +6,7 @@ # # $LicenseInfo:firstyear=2007&license=viewergpl$ # -# Copyright (c) 2007, 2008 Linden Research, Inc. +# Copyright (c) 2007-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 @@ # ("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, |