diff options
| author | Ben Skeggs <skeggsb@localhost.localdomain> | 2008-08-07 11:19:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@localhost.localdomain> | 2008-08-07 11:19:15 +1000 |
| commit | 4b1c508f49a070f113929393423d6704f1ff18b6 (patch) | |
| tree | 76803b434b75b438c44829ed55e1a19b208dde01 /src/gallium/auxiliary/cso_cache | |
| parent | 7fde9febd6f212494730ebef916fe25c95d30be9 (diff) | |
| parent | be66a8f43172327e3cdde27281e40377cacbb121 (diff) | |
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/cso_cache')
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index af4af8ac1d..86e4d46a20 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -38,7 +38,7 @@ #include "pipe/p_state.h" #include "pipe/p_util.h" #include "pipe/p_inlines.h" -#include "tgsi/util/tgsi_parse.h" +#include "tgsi/tgsi_parse.h" #include "cso_cache/cso_context.h" #include "cso_cache/cso_cache.h" |