From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan 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/llscrollbar.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llui/llscrollbar.cpp') diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp index 2c4a5cbc58..3536e6bb03 100644 --- a/indra/llui/llscrollbar.cpp +++ b/indra/llui/llscrollbar.cpp @@ -41,10 +41,8 @@ #include "llcriticaldamp.h" #include "llkeyboard.h" #include "llui.h" -//#include "llviewerimagelist.h" #include "llfocusmgr.h" #include "llwindow.h" -#include "llglheaders.h" #include "llcontrol.h" #include "llglimmediate.h" -- cgit v1.2.3