From c618a55f769946369e3d80f71eeb3c42042ab4e0 Mon Sep 17 00:00:00 2001 From: Josh Bell <josh@lindenlab.com> Date: Mon, 8 Jan 2007 20:02:51 +0000 Subject: [PATCH] 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. --- indra/newview/English.lproj/InfoPlist.strings | 4 ++-- indra/newview/Info-SecondLife.plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 8cbe6351553..f3d59db32a1 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.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."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index c2ec0313afe..8e1570561eb 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -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> -- GitLab