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_bitmap.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_bitmap.c')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index f3dda12e25..2308acae1c 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -28,10 +28,10 @@ * \author Brian Paul */ -#include "glheader.h" +#include "main/glheader.h" #include "bufferobj.h" #include "image.h" -#include "macros.h" +#include "main/macros.h" #include "pixel.h" #include "s_context.h" |