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/llvfs/lllfsthread.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llvfs/lllfsthread.cpp')

diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp
index 8d2dc72ffc..76e25e2272 100644
--- a/indra/llvfs/lllfsthread.cpp
+++ b/indra/llvfs/lllfsthread.cpp
@@ -30,7 +30,6 @@
  */
 
 #include "linden_common.h"
-#include "llmath.h"
 #include "lllfsthread.h"
 #include "llstl.h"
 #include "llapr.h"
-- 
cgit v1.2.3