diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-09-30 11:57:45 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-09-30 11:57:45 +1000 |
| commit | 8cd046c9b1da31e4ff178816bdfe2ee3451a1553 (patch) | |
| tree | 6b9de732a9d75c3005a80b078af0c97b9cb6c0ab /src/mesa/drivers/dri/sis/sis_state.c | |
| parent | 8c14bd6992e338da8e467775b0237c8db7cbe44d (diff) | |
| parent | 5dc8e67078be8b8c42a809311debd275ac7d64a7 (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'src/mesa/drivers/dri/sis/sis_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/sis/sis_state.c b/src/mesa/drivers/dri/sis/sis_state.c index cb672c2c7c..98e8d02fab 100644 --- a/src/mesa/drivers/dri/sis/sis_state.c +++ b/src/mesa/drivers/dri/sis/sis_state.c @@ -37,9 +37,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "sis_lock.h" #include "sis_tex.h" -#include "context.h" -#include "enums.h" -#include "colormac.h" +#include "main/context.h" +#include "main/enums.h" +#include "main/colormac.h" #include "swrast/swrast.h" #include "vbo/vbo.h" #include "tnl/tnl.h" |