diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-13 07:24:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 07:24:37 -0400 |
| commit | a5619d16f74863168f45b04b37cc6383e1a92263 (patch) | |
| tree | babc9b62e24e743968d4d620fcbda65bed845a59 /indra/llcommon/stringize.h | |
| parent | 1259e05edcef4d1e23b38c9ca06b4ecd3f858781 (diff) | |
correct licenses (fix problem with license change merge)
Diffstat (limited to 'indra/llcommon/stringize.h')
| -rw-r--r-- | indra/llcommon/stringize.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/indra/llcommon/stringize.h b/indra/llcommon/stringize.h index 6399547f5e..72f2e58ce1 100644 --- a/indra/llcommon/stringize.h +++ b/indra/llcommon/stringize.h @@ -4,8 +4,25 @@ * @date 2008-12-17 * @brief stringize(item) template function and STRINGIZE(expression) macro * - * $LicenseInfo:firstyear=2008&license=viewergpl$ - * Copyright (c) 2008, Linden Research, Inc. + * $LicenseInfo:firstyear=2008&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ |