From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 28 Aug 2008 23:57:41 +0000
Subject: merge viewer/viewer_1-21 94170-94770 -> release merge
 viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme
 for viewer + server Release Notes on the wiki! QAR-797 teleport failures
 (DEV-6198 / SVC-972) mergeme

---
 indra/newview/secondlife.icns | Bin 115923 -> 135209 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'indra/newview/secondlife.icns')

diff --git a/indra/newview/secondlife.icns b/indra/newview/secondlife.icns
index 31ce7b3250..ceb6036e0e 100644
Binary files a/indra/newview/secondlife.icns and b/indra/newview/secondlife.icns differ
-- 
cgit v1.2.3