diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-27 00:54:57 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-27 00:54:57 +1000 |
| commit | 9e445d3e6374c2a9b163f1262ea5a1047e596cae (patch) | |
| tree | 7a63f048928947fb57342de9b53a3d0924f50d5b /src/mesa/swrast/s_context.c | |
| parent | d1dc937c62083c3d8ab9f420df8e54f5c3217468 (diff) | |
| parent | ff7a7031caa0ac592f210aca696a20c9de6dc0d4 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index f43fa61f8a..4d9b956f85 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -26,11 +26,11 @@ * Brian Paul */ -#include "imports.h" +#include "main/imports.h" #include "bufferobj.h" -#include "context.h" -#include "colormac.h" -#include "mtypes.h" +#include "main/context.h" +#include "main/colormac.h" +#include "main/mtypes.h" #include "teximage.h" #include "swrast.h" #include "shader/prog_statevars.h" |