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

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

diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index 36b84c741f..c577b35e19 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -44,7 +44,6 @@
 #include "lltextbox.h"
 #include "llkeyboard.h"
 #include "llmath.h"
-#include "sound_ids.h"
 #include "audioengine.h"
 #include "llcontrol.h"
 #include "llfocusmgr.h"
-- 
cgit v1.2.3