summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-11-22 02:21:15 +0000
committerChristian Goetze <cg@lindenlab.com>2007-11-22 02:21:15 +0000
commitfa098e1dee46a25f20a7fd158b7f2dd17433d02b (patch)
tree33ce604e9d018eba8e5648321c77e47970525628 /indra/newview
parent25dbf0c56786bff1b2945ef07f41cdeabd6f9329 (diff)
svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release
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 a25f97768a..9dfdda9345 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.5.1";
-CFBundleGetInfoString = "Second Life version 1.18.5.1, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.5.2";
+CFBundleGetInfoString = "Second Life version 1.18.5.2, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 2c9f58a0c0..fac66b8ee4 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.5.1</string>
+ <string>1.18.5.2</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>