From b01d567a5d9e2b5dd28bcc7b3f474fabd93e7a2f Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 7 Dec 2007 20:27:13 +0000
Subject: EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 ->
 maint-viewer-2-merge EFFECTIVE MERGE: merge -r 74370 library-update ->
 maint-viewer-2-merge ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293
 -> release

---
 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 427651ccba..59822a1e4c 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.3</string>
+	<string>1.18.6.0</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
-- 
cgit v1.2.3