summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
commit4942a7b77917f9a163453ecdd040993965672cc0 (patch)
tree3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llwindow
parent9fc7049151a16e3722c6ce90899e3c7b63161615 (diff)
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/lldxhardware.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index dc3edadb9c..35b7384c2f 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -12,7 +12,6 @@
#include "linden_common.h"
-#include <assert.h>
#include <dxdiag.h>
#include <boost/tokenizer.hpp>