diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-11 18:25:51 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-11 18:25:51 +0100 |
commit | 8c9587225a68f9b6276f08691d1a0ddbe67edd9a (patch) | |
tree | cb1929fc8b24b4abef902c7fb7b04b40024778b3 /indra/newview/llstartup.cpp | |
parent | 8e725a8694f8537d696a6943ea2323c56a5fa169 (diff) | |
parent | b181dc15217c2fef234e308063d313d33ecb9df7 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
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 fff80e57dc..9bfcceab2f 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 |