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

svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release

master
Christian Goetze 2007-11-22 02:21:15 +00:00
parent 25dbf0c567
commit fa098e1dee
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h
View File

@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 1;
const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Second Life Release";

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

@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
CFBundleShortVersionString = "Second Life version 1.18.5.1";
CFBundleGetInfoString = "Second Life version 1.18.5.1, Copyright 2004-2007 Linden Research, Inc.";
CFBundleShortVersionString = "Second Life version 1.18.5.2";
CFBundleGetInfoString = "Second Life version 1.18.5.2, Copyright 2004-2007 Linden Research, Inc.";

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

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