diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
| commit | 87e3301533aa4d3e6e98db139887ebba3d217f7d (patch) | |
| tree | ad80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /src/mesa/state_tracker/st_cache.c | |
| parent | 49405c43f245d3b3ddd12e891413bf7ead23145c (diff) | |
| parent | 3320b1874e810583f95b93a89697b2955987b84f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/state_tracker/st_cache.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c index e0965b217a..2979e7fae5 100644 --- a/src/mesa/state_tracker/st_cache.c +++ b/src/mesa/state_tracker/st_cache.c @@ -36,8 +36,8 @@ #include "pipe/p_state.h" -#include "pipe/cso_cache/cso_cache.h" -#include "pipe/cso_cache/cso_hash.h" +#include "cso_cache/cso_cache.h" +#include "cso_cache/cso_hash.h" /* Those function will either find the state of the given template |