diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 15:27:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 15:27:36 +0300 |
| commit | 4ddaeb377271361f4a104774709d4ba31568e9de (patch) | |
| tree | 0c19f415cb30983169a1a6aa3559b83841ee78e3 /indra/newview/res | |
| parent | 26f70456d1e9059c48d25e08fc07f893315b1f3c (diff) | |
| parent | 363b89947c580e1056cb5f4ae32ebfd9eaf12a17 (diff) | |
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C merge
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 |