summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2008-08-12 17:52:55 +0000
committerChristian Goetze <cg@lindenlab.com>2008-08-12 17:52:55 +0000
commit93328402371424df7a26eefc6b6866a76a4f308d (patch)
treeba75424b9b6760e0bfd30ac46b43f278724011e7 /indra/newview
parent80be4c1d2d73982ea2df6dd7ef3fc3465416c882 (diff)
svn -c 94141 merge svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--indra/newview/Info-SecondLife.plist2
-rw-r--r--indra/newview/res/viewerRes.rc8
3 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 881483e892..144f85217a 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.20.9.87416";
-CFBundleGetInfoString = "Second Life version 1.20.9.87416, Copyright 2004-2008 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.20.15.94081";
+CFBundleGetInfoString = "Second Life version 1.20.15.94081, Copyright 2004-2008 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index b889d45b9e..52eb97f7f7 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.20.9.87416</string>
+ <string>1.20.15.94081</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index a39bb9faf6..c2c86300ce 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,9,87416
- PRODUCTVERSION 1,20,9,87416
+ FILEVERSION 1,20,15,94081
+ PRODUCTVERSION 1,20,15,94081
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "1.20.9.87416"
+ VALUE "FileVersion", "1.20.15.94081"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "1.20.9.87416"
+ VALUE "ProductVersion", "1.20.15.94081"
END
END
BLOCK "VarFileInfo"