diff options
| author | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-17 15:42:39 +0800 |
|---|---|---|
| committer | Zou Nan hai <nanhai.zou@intel.com> | 2007-07-17 15:42:39 +0800 |
| commit | 3c00cdc5f37856f303a6256677364ae89200c509 (patch) | |
| tree | b4f191fb2bbe9b409fdc775db8f537c439974a21 /src/mesa/tnl/t_pipeline.c | |
| parent | 24e7acd5e4f1e7e71909f94fd1f075abd268d086 (diff) | |
| parent | 7b410f366fa117a03a7e838562215d2dca3f8cbc (diff) | |
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
Diffstat (limited to 'src/mesa/tnl/t_pipeline.c')
| -rw-r--r-- | src/mesa/tnl/t_pipeline.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c index c7188da34a..2a0ed8852a 100644 --- a/src/mesa/tnl/t_pipeline.c +++ b/src/mesa/tnl/t_pipeline.c @@ -25,11 +25,11 @@ * Keith Whitwell <keith@tungstengraphics.com> */ -#include "glheader.h" -#include "context.h" -#include "imports.h" -#include "state.h" -#include "mtypes.h" +#include "main/glheader.h" +#include "main/context.h" +#include "main/imports.h" +#include "main/state.h" +#include "main/mtypes.h" #include "t_context.h" #include "t_pipeline.h" |