diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-14 22:31:04 +0000 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-14 22:31:04 +0000 |
commit | b01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch) | |
tree | a62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /src/mesa/x86 | |
parent | ffd28480560caecfb676a4bbe85a85672271e3f7 (diff) | |
parent | 252812bf15c3479d921157b9a432c7e42d3b9446 (diff) | |
download | external_mesa3d-b01ffb12ed82dcf435b186e2aff35e344a8a6ebe.zip external_mesa3d-b01ffb12ed82dcf435b186e2aff35e344a8a6ebe.tar.gz external_mesa3d-b01ffb12ed82dcf435b186e2aff35e344a8a6ebe.tar.bz2 |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'src/mesa/x86')
-rw-r--r-- | src/mesa/x86/x86_xform.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/x86/x86_xform.c b/src/mesa/x86/x86_xform.c index 52f6b25..c834e2b 100644 --- a/src/mesa/x86/x86_xform.c +++ b/src/mesa/x86/x86_xform.c @@ -30,7 +30,6 @@ #include "main/glheader.h" #include "main/context.h" #include "math/m_xform.h" -#include "tnl/t_context.h" #include "x86_xform.h" #include "common_x86_asm.h" |