summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-23 10:58:34 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-23 10:58:34 +0000
commita67d890523e49b1dcb177fafc63e1081d9f65f6c (patch)
tree4c6d654770aa53a2e1f1ca4b24ed9fa8d0a247dc /indra/newview/llstartup.cpp
parentb05a2dc76acc6c1ca4bfc09de37326027dbf038d (diff)
parentdcbbf64c41aac85613591b51071b9453bdb1df0f (diff)
merge.
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index fa07278cb9..83f773fadc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -200,10 +200,6 @@
#include "lldxhardware.h"
#endif
-#if (LL_LINUX || LL_SOLARIS) && LL_GTK
-#include <glib/gspawn.h>
-#endif
-
//
// exported globals
//