diff options
| author | Ben Skeggs <[email protected]> | 2008-08-07 11:19:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-08-07 11:19:15 +1000 |
| commit | 4b1c508f49a070f113929393423d6704f1ff18b6 (patch) | |
| tree | 76803b434b75b438c44829ed55e1a19b208dde01 /src/gallium/auxiliary/gallivm/gallivm.cpp | |
| parent | 7fde9febd6f212494730ebef916fe25c95d30be9 (diff) | |
| parent | be66a8f43172327e3cdde27281e40377cacbb121 (diff) | |
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/gallivm/gallivm.cpp')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/gallivm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/gallivm.cpp b/src/gallium/auxiliary/gallivm/gallivm.cpp index 77900e342b1..29adeea47de 100644 --- a/src/gallium/auxiliary/gallivm/gallivm.cpp +++ b/src/gallium/auxiliary/gallivm/gallivm.cpp @@ -42,8 +42,8 @@ #include "pipe/p_context.h" #include "pipe/p_shader_tokens.h" -#include "tgsi/exec/tgsi_exec.h" -#include "tgsi/util/tgsi_dump.h" +#include "tgsi/tgsi_exec.h" +#include "tgsi/tgsi_dump.h" #include <llvm/Module.h> #include <llvm/CallingConv.h> |