diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-10 18:57:18 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-10 18:57:18 +0100 |
commit | 5f8cc41e798daecb481cbabdbbd080a53f5253a6 (patch) | |
tree | d8f67746607e592e1002b3b4a1a77269d0b3892f /indra/newview/llstartup.cpp | |
parent | 9370ffac47665c309c28fb075b26d8da43192e23 (diff) | |
parent | f2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (diff) |
Merging latest dessie/viewer-release into brad/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 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 |