From df4f20d4f51e41355e876f734527b4245543415c Mon Sep 17 00:00:00 2001
From: Karl Steifvater <qarl@lindenlab.com>
Date: Tue, 22 Jul 2008 20:12:37 +0000
Subject: merge uv-picking branch.

svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
---
 indra/newview/llviewermedia.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llviewermedia.cpp')

diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 1586f8dc75..3f57b26fec 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -694,5 +694,3 @@ void LLViewerMedia::setMimeType(std::string mime_type)
 {
 	sViewerMediaImpl.mMimeType = mime_type;
 }
-
-
-- 
cgit v1.2.3