diff options
| author | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-10 12:15:42 +0800 |
| commit | ae27a93395ef01535e03e02ec9fa5e221ce58e23 (patch) | |
| tree | 0529dc96ad0f1ed9513652aad18e9702d676b772 /indra/llui | |
| parent | 5662a8d126b3dab1100aab014aeaeb1752dba26a (diff) | |
| parent | 6106c9a7dadcf0ba4a33ad1ee826ccd31909b893 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llview.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index a82e6eb372..4cf503b413 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -43,7 +43,6 @@ #include "llrender.h" #include "llrect.h" #include "lldir.h" -#include "llfontgl.h" #include "llgl.h" // Project includes diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index fe7fd59de8..f9b4a6b73d 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -40,7 +40,6 @@ #include "llrender.h" #include "llevent.h" -#include "llfontgl.h" #include "llfocusmgr.h" #include "llrect.h" #include "llstl.h" |