From 75b1cc886ded370f79b85152af2a462b37aed903 Mon Sep 17 00:00:00 2001 From: Josh Bell <josh@lindenlab.com> Date: Tue, 2 Oct 2007 23:31:38 +0000 Subject: [PATCH] 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) --- indra/llcommon/llversionviewer.h | 2 +- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- indra/newview/Info-SecondLife.plist | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 282e8a18c5c..e9e22fcef33 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -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"; diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 9b09bc3b89e..420236c7d6d 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -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."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 955532b2395..263babe019a 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -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> -- GitLab