diff options
author | brad kittenbrink <brad@lindenlab.com> | 2010-06-01 10:06:40 -0700 |
---|---|---|
committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-01 10:06:40 -0700 |
commit | 592ee60a1367f37e8bc02d9e5ffcc593d01d92e3 (patch) | |
tree | 4deddc4bc53dcdaea3870e23940ced3387891812 /indra/newview/llstartup.cpp | |
parent | 4cc5c7d2a4511ffc65bf3b6b0b2e29beb5b0fed4 (diff) | |
parent | 648b55390709f832aac01b914ef4834e40c7b5f9 (diff) |
Automated merge with http://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 6418551517..8021c71d3f 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 |