diff options
| author | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
| commit | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch) | |
| tree | 78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/pipeline.cpp | |
| parent | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff) | |
| parent | 910874a7e32bdfc456474e2d0ee84d190be3011e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 870ee6a103..1d9137c161 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -30,7 +30,6 @@ // library includes #include "llaudioengine.h" // For debugging. -#include "imageids.h" #include "llerror.h" #include "llviewercontrol.h" #include "llfasttimer.h" @@ -40,7 +39,6 @@ #include "llprimitive.h" #include "llvolume.h" #include "material_codes.h" -#include "timing.h" #include "v3color.h" #include "llui.h" #include "llglheaders.h" |