diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-07-11 22:11:22 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-07-11 22:11:22 +0000 |
| commit | 35bcaa96556dc2092a95d67c0d3515db8cf9e9ff (patch) | |
| tree | 95d5e98f67623aed43721d8145356ecfb238cf1c | |
| parent | 57b8fef824b6d7f37c5be5812ebffa39ab2e8093 (diff) | |
svn merge -r 65078:65118 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate --> release
Sync up last minute patches that went into 1.18.
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index a0320e3f1d..bc1c7dd62a 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.4"; -CFBundleGetInfoString = "Second Life version 1.18.0.4, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.0.6"; +CFBundleGetInfoString = "Second Life version 1.18.0.6, Copyright 2004-2007 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index 0536589d7a..f4dd8e0a99 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.4</string> + <string>1.18.0.6</string> <key>CSResourcesFileMapped</key> <true/> </dict> |