From 35bcaa96556dc2092a95d67c0d3515db8cf9e9ff Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Wed, 11 Jul 2007 22:11:22 +0000 Subject: svn merge -r 65078:65118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release Sync up last minute patches that went into 1.18. --- 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 a0320e3f1d..bc1c7dd62a 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.0.4"; -CFBundleGetInfoString = "Second Life version 1.18.0.4, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.0.6"; +CFBundleGetInfoString = "Second Life version 1.18.0.6, Copyright 2004-2007 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 0536589d7a..f4dd8e0a99 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.18.0.4 + 1.18.0.6 CSResourcesFileMapped -- cgit v1.2.3