From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers --- indra/llui/llscrollcontainer.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/llui/llscrollcontainer.cpp') diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index edad4c4d6b..72fe2040af 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -32,9 +32,7 @@ #include "linden_common.h" -#include "llgl.h" #include "llglimmediate.h" - #include "llscrollcontainer.h" #include "llscrollbar.h" #include "llui.h" @@ -45,8 +43,6 @@ #include "lluictrlfactory.h" #include "llfontgl.h" -#include "llglheaders.h" - ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- -- cgit v1.2.3