diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
commit | 185cd5d261a4bc6e02f49f40c72d76da4320a881 (patch) | |
tree | c08ae4afb5e79f6b90bfe085a32b4d3e6e16a070 /indra/newview/llstartup.cpp | |
parent | eec00a712fff079009ae793d86e27b7f3ab13053 (diff) | |
parent | edd224dc7b08ad72c0f36c5b0f24912fdf66ab1c (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e51e6363dd..35e86b75e7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -199,7 +199,6 @@ #include "llstartuplistener.h" #if LL_WINDOWS -#include "llwindebug.h" #include "lldxhardware.h" #endif |