diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 23:19:43 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 23:19:43 +0000 |
| commit | 5595a996234cbe610f9681dbe8ed26880decd94a (patch) | |
| tree | 7e2e8790ec131ea698533f0682415cf70504fd89 /indra/newview/secondlife-i686.supp | |
| parent | 4942a7b77917f9a163453ecdd040993965672cc0 (diff) | |
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
Diffstat (limited to 'indra/newview/secondlife-i686.supp')
| -rw-r--r-- | indra/newview/secondlife-i686.supp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/indra/newview/secondlife-i686.supp b/indra/newview/secondlife-i686.supp index b1b30a441f..43d4483466 100644 --- a/indra/newview/secondlife-i686.supp +++ b/indra/newview/secondlife-i686.supp @@ -1,8 +1,31 @@ # @file secondlife-i686.supp # @brief Valgrind suppressions for Linux i686 viewer. # -# Copyright (c) 2000-$CurrentYear$, Linden Research, Inc. -# $License$ +# $LicenseInfo:firstyear=2000&license=viewergpl$ +# +# Copyright (c) 2000-2007, Linden Research, Inc. +# +# Second Life Viewer Source Code +# The source code in this file ("Source Code") is provided by Linden Lab +# 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 +# +# 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 +# +# By copying, modifying or distributing this software, you acknowledge +# that you have read and understood your obligations described above, +# and agree to abide by those obligations. +# +# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +# COMPLETENESS OR PERFORMANCE. +# $/LicenseInfo$ # # This is a Valgrind suppression file for use on the viewer. # |