summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Kaprielian <sabin@lindenlab.com>2008-04-09 06:12:20 +0000
committerDave Kaprielian <sabin@lindenlab.com>2008-04-09 06:12:20 +0000
commit16f6d79f769398bbb43f99de734257115a9608ca (patch)
tree5b750ebd35dcc026dbbf778090701b8fe5a569f7 /indra/newview
parentb73ad517841cb428a395a6f49376d3bdc8e50f7e (diff)
svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server
Diffstat (limited to 'indra/newview')
-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 bb7ddc17a6..6012c011c1 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.19.1.4";
-CFBundleGetInfoString = "Second Life version 1.19.1.4, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.1.84396";
+CFBundleGetInfoString = "Second Life version 1.19.1.84396, Copyright 2004-2008 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 492e589384..62f5ea167d 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.19.1.4</string>
+ <string>1.19.1.84396</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>