summaryrefslogtreecommitdiff
path: root/indra/newview/English.lproj/InfoPlist.strings
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-09-13 18:17:52 +0000
committerJosh Bell <josh@lindenlab.com>2007-09-13 18:17:52 +0000
commitb3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (patch)
tree8b94c90d06bcd0ed5d258ab1e8c5d67024683cab /indra/newview/English.lproj/InfoPlist.strings
parenta5f3ac2a8dc9aee2c04f24c3b3304c1b24808acb (diff)
svn merge -r 68690:69597 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. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
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 e3ef269a68..0b95b39824 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.2.46464";
-CFBundleGetInfoString = "Second Life version 1.18.2.46464, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.3";
+CFBundleGetInfoString = "Second Life version 1.18.3.3, Copyright 2004-2007 Linden Research, Inc.";