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/llthread.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index a07c64b8fc..7864d93395 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -36,7 +36,7 @@
 #include "llapp.h"
 #include "llmemory.h"
 
-#include "apr-1/apr_thread_cond.h"
+#include "apr_thread_cond.h"
 
 class LLThread;
 class LLMutex;
-- 
cgit v1.2.3