Skip to content
Snippets Groups Projects
Commit fa098e1d authored by Christian Goetze's avatar Christian Goetze
Browse files

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

parent 25dbf0c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/llversionviewer.h
+ 1
− 1
View file @ fa098e1d
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18; const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 5; 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"; const char * const LL_CHANNEL = "Second Life Release";
......
indra/newview/English.lproj/InfoPlist.strings
+ 2
− 2
View file @ fa098e1d
/* Localized versions of Info.plist keys */ /* Localized versions of Info.plist keys */
CFBundleName = "Second Life"; CFBundleName = "Second Life";
CFBundleShortVersionString = "Second Life version 1.18.5.1"; CFBundleShortVersionString = "Second Life version 1.18.5.2";
CFBundleGetInfoString = "Second Life version 1.18.5.1, Copyright 2004-2007 Linden Research, Inc."; CFBundleGetInfoString = "Second Life version 1.18.5.2, Copyright 2004-2007 Linden Research, Inc.";
indra/newview/Info-SecondLife.plist
+ 1
− 1
View file @ fa098e1d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.18.5.1</string> <string>1.18.5.2</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
</dict> </dict>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment