summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-07-27 21:54:03 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-07-27 21:54:03 +0000
commite27e86e0334dc847687a557d0891c6ca91bb7de9 (patch)
tree390b20944d92798da8a17edef2e6862614bd6678 /indra
parentef32d1d6b03aad55b26c5e1537cdbc47c6b6c0c4 (diff)
merge -r 66456:66594 Branch_1-18-1 -> release
Includes voice-server-changes (0:66493)
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--indra/newview/Info-SecondLife.plist2
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index bc1c7dd62a..5991f9150f 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.6";
-CFBundleGetInfoString = "Second Life version 1.18.0.6, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.1.1";
+CFBundleGetInfoString = "Second Life version 1.18.1.1, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index f4dd8e0a99..9bef82e0bc 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.18.0.6</string>
+ <string>1.18.1.1</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>