diff options
| author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
| commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/res | |
| parent | 1.1 version final (diff) | |
| parent | Merge branch 'sl-base-1.22' into next (diff) | |
| download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz | |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/res')
| -rw-r--r-- | linden/indra/newview/res/resource.h | 2 | ||||
| -rw-r--r-- | linden/indra/newview/res/viewerRes.rc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/res/resource.h b/linden/indra/newview/res/resource.h index 9fcfa21..cfa014a 100644 --- a/linden/indra/newview/res/resource.h +++ b/linden/indra/newview/res/resource.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 4 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2001-2008, Linden Research, Inc. | 6 | * Copyright (c) 2001-2009, Linden Research, Inc. |
| 7 | * | 7 | * |
| 8 | * Second Life Viewer Source Code | 8 | * Second Life Viewer Source Code |
| 9 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 002830a..e0cde48 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc | |||
| @@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" | |||
| 231 | // | 231 | // |
| 232 | 232 | ||
| 233 | VS_VERSION_INFO VERSIONINFO | 233 | VS_VERSION_INFO VERSIONINFO |
| 234 | FILEVERSION 1,20,9,87416 | 234 | FILEVERSION 1,20,15,97417 |
| 235 | PRODUCTVERSION 1,20,9,87416 | 235 | PRODUCTVERSION 1,20,15,97417 |
| 236 | FILEFLAGSMASK 0x3fL | 236 | FILEFLAGSMASK 0x3fL |
| 237 | #ifdef _DEBUG | 237 | #ifdef _DEBUG |
| 238 | FILEFLAGS 0x1L | 238 | FILEFLAGS 0x1L |