From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
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/llpanel.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llui/llpanel.cpp')

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 875f114ce3..fb14470612 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -55,8 +55,6 @@
 #include "llbutton.h"
 
 // LLLayoutStack
-#include "llgl.h"
-#include "llglheaders.h"
 #include "llresizebar.h"
 #include "llcriticaldamp.h"
 
-- 
cgit v1.2.3