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/llcommon/lldarray.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llcommon/lldarray.h')

diff --git a/indra/llcommon/lldarray.h b/indra/llcommon/lldarray.h
index c7268b8dab..8784bdfb02 100644
--- a/indra/llcommon/lldarray.h
+++ b/indra/llcommon/lldarray.h
@@ -32,7 +32,6 @@
 #ifndef LL_LLDARRAY_H
 #define LL_LLDARRAY_H
 
-#include "llmath.h"
 #include "llerror.h"
 
 #include <vector>
-- 
cgit v1.2.3