diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-05-27 15:40:16 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-05-27 15:40:16 -0700 |
| commit | d9052212b5c575e31ddfe358c228e0ba9a7403ed (patch) | |
| tree | 1670d0c29894ff18f8a48dcfab99877bddd11eaf /indra/newview/llstartup.cpp | |
| parent | 0c7fafb70425853df26c703969e7a1892de2374e (diff) | |
| parent | 4e8d423cc5fae86c8273df5e7ea583a9e0475711 (diff) | |
Merge of latest dessie/viewer-public with 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 466c154f36..d1fd0133e7 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 |