diff options
| author | Dave Kaprielian <sabin@lindenlab.com> | 2008-12-05 21:54:29 +0000 |
|---|---|---|
| committer | Dave Kaprielian <sabin@lindenlab.com> | 2008-12-05 21:54:29 +0000 |
| commit | 2db8e83bcacef815a69fbb79430dc3431e5dedfe (patch) | |
| tree | e0f790792078f861c598f57eba5f2257d59d0c19 | |
| parent | 992d2867aeb2f728552c7d74fcd63867696032a0 (diff) | |
merge -r104755:104769 /linden/branches/deploy-refactor-6 --> trunk
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/res/viewerRes.rc | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 90646be31f..2b72819653 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Second Life"; -CFBundleShortVersionString = "Second Life version 1.20.15.97417"; -CFBundleGetInfoString = "Second Life version 1.20.15.97417, Copyright 2004-2008 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.21.6.100000"; +CFBundleGetInfoString = "Second Life version 1.21.6.100000, Copyright 2004-2008 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 3c55badc23..0a81611711 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.20.15.97417</string> + <string>1.21.6.100000</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 8df0c57ef2..152ff15d5d 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,20,15,97417 - PRODUCTVERSION 1,20,15,97417 + FILEVERSION 1,21,6,100000 + PRODUCTVERSION 1,21,6,100000 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -249,12 +249,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.20.15.97417" + VALUE "FileVersion", "1.21.6.100000" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.20.15.97417" + VALUE "ProductVersion", "1.21.6.100000" END END BLOCK "VarFileInfo" |