livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r97452:97484 svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2

master
Dave Kaprielian 2008-09-23 23:15:14 +00:00
parent f89d3a7c2d
commit d0c70d11cb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionserver.h
View File

@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 24;
const S32 LL_VERSION_PATCH = 6;
const S32 LL_VERSION_BUILD = 0;
const S32 LL_VERSION_BUILD = 94536;
const char * const LL_CHANNEL = "Second Life Server";

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
CFBundleShortVersionString = "Second Life version 1.20.9.87416";
CFBundleGetInfoString = "Second Life version 1.20.9.87416, Copyright 2004-2008 Linden Research, Inc.";
CFBundleShortVersionString = "Second Life version 1.20.15.0";
CFBundleGetInfoString = "Second Life version 1.20.15.0, Copyright 2004-2008 Linden Research, Inc.";

2
indra/newview/Info-SecondLife.plist
View File

@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.20.9.87416</string>
<string>1.20.15.0</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>

8
indra/newview/res/viewerRes.rc
View File

@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,20,9,87416
PRODUCTVERSION 1,20,9,87416
FILEVERSION 1,20,15,0
PRODUCTVERSION 1,20,15,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -249,12 +249,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
VALUE "FileVersion", "1.20.9.87416"
VALUE "FileVersion", "1.20.15.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
VALUE "ProductVersion", "1.20.9.87416"
VALUE "ProductVersion", "1.20.15.0"
END
END
BLOCK "VarFileInfo"