diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-23 13:02:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 13:02:08 -0700 |
| commit | 0cc832c38a34013a9eebf8d3caad2921bead265d (patch) | |
| tree | 8d916206343d075fc85e90e83ec9dabe8b01376d /indra/newview/res | |
| parent | 03c4458bdcc6821a3047f93b729d412e274ab9af (diff) | |
| parent | 9f6849e081deac1f62ab3010ee0984e17749c9e6 (diff) | |
Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev
merge maint-a (including maint-x) into gltf_development
Diffstat (limited to 'indra/newview/res')
| -rw-r--r-- | indra/newview/res/resource.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 01d90da971..e904f4a1a8 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -1,24 +1,24 @@ -/** +/** * @file resource.h * * $LicenseInfo:firstyear=2001&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$ */ @@ -167,7 +167,7 @@ #define ID_TESTMENU_TEST 40001 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 173 |