summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2008-01-28 23:36:41 +0000
committerJosh Bell <josh@lindenlab.com>2008-01-28 23:36:41 +0000
commit6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (patch)
treee4c7b66768581bcd656148e13e732f43f9f11829 /indra/newview
parent5a85e84dea0828aeaac2dbafbdfcdab436648c74 (diff)
svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
Port these changes which have passed QA in QAR-186: * Bumping version numbers to 1.19.0 * DEV-8872 Text in group list in profile and group notices is difficult to read * DEV-9290 Clicking on Chat button in toolbar does not toggle chat bar * DEV-4721 Upload symbol map files to S3
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 81d40ac484..e71617850a 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.6.4";
-CFBundleGetInfoString = "Second Life version 1.18.6.4, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.0.78408";
+CFBundleGetInfoString = "Second Life version 1.19.0.78408, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 44e9a47438..e007e6f62a 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.6.4</string>
+ <string>1.19.0.78408</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>