From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001
From: Brad Kittenbrink <brad@lindenlab.com>
Date: Wed, 27 Feb 2008 18:58:14 +0000
Subject: Merge of windlight into release (QAR-286).  This includes all changes
 in windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
---
 indra/llprimitive/lltextureentry.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llprimitive/lltextureentry.cpp')

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index e6eee9bf13..837f8ef361 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -389,4 +389,3 @@ S32 LLTextureEntry::setGlow(F32 glow)
 	}
 	return 0;
 }
-
-- 
cgit v1.2.3