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

svn merge -r 70080:70711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer 

Pick up last minute patches to the viewer from 1.18.3 final release.
* Final release notes and version numbers
* SL-55123 Mac app icon missing from open source tarball (missed from previous merge?)
* SL-55121 Mac mouse cursors missing from open source tarball (missed from previous merge?)

(I believe the previous merge in this series, r70180, only committed changes inside indra. I've scrubbed the history of that range and don't see any other missing files other than the two assemblies/ patches noted above)
meow-7.2.2
Josh Bell 2007-10-02 23:31:38 +00:00
parent 6981b3bc36
commit 75b1cc886d
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

@ -12,7 +12,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 4;
const S32 LL_VERSION_BUILD = 5;
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.3.4";
CFBundleGetInfoString = "Second Life version 1.18.3.4, Copyright 2004-2007 Linden Research, Inc.";
CFBundleShortVersionString = "Second Life version 1.18.3.5";
CFBundleGetInfoString = "Second Life version 1.18.3.5, 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.3.4</string>
<string>1.18.3.5</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>