summaryrefslogtreecommitdiff
path: root/indra/newview/English.lproj/InfoPlist.strings
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-09-20 17:51:27 +0000
committerJosh Bell <josh@lindenlab.com>2007-09-20 17:51:27 +0000
commit9b9769b76e1bbaa14c6b3bc5064e97e498c8e985 (patch)
tree724d49ba34371ef25825dd2142879111f1590685 /indra/newview/English.lproj/InfoPlist.strings
parent2add0e15d7d50d1ca238c027f4ca7d56a8af08de (diff)
svn merge -r 69597:70080 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk. * SL-55085 Login hangs if optional update is declined. * SL-55123 Mac app icon missing from open source tarball * SL-55121 Mac mouse cursors missing from open source tarball * SL-54978 Remove duplicate code that snuck in during a patch merge * SL-54633 VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update * Release notes/version numbers
Diffstat (limited to 'indra/newview/English.lproj/InfoPlist.strings')
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 0b95b39824..9b09bc3b89 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.3";
-CFBundleGetInfoString = "Second Life version 1.18.3.3, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.4";
+CFBundleGetInfoString = "Second Life version 1.18.3.4, Copyright 2004-2007 Linden Research, Inc.";