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

svn merge -r 56262:56561 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-1 

Reviewed by doug. This code is running on Agni, but needed to merge into doug's new nightly stuff.
master
Josh Bell 2007-01-08 20:02:51 +00:00
parent 30c9f26561
commit c618a55f76
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.13.1.6";
CFBundleGetInfoString = "Second Life version 1.13.1.6, Copyright 2004-2006 Linden Research, Inc.";
CFBundleShortVersionString = "Second Life version 1.13.1.7";
CFBundleGetInfoString = "Second Life version 1.13.1.7, Copyright 2004-2006 Linden Research, Inc.";

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

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