From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Fri, 21 Dec 2007 06:44:41 +0000
Subject: svn merge -r74200:76302
 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer -->
 release

Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
---
 indra/newview/Info-SecondLife.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/Info-SecondLife.plist')

diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 59822a1e4c..c753469212 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.0</string>
+	<string>1.18.6.2</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
-- 
cgit v1.2.3