Merge branch 'gallium-0.1' into gallium-tex-surfaces
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 2 May 2008 11:00:13 +0000 (12:00 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 2 May 2008 11:00:13 +0000 (12:00 +0100)
commitc3a8a41faabed4c9b84a6fbaf7a86a089b8fcbba
treef9ae084994ac92d139e38d4ce84a82cfa01c5f69
parent731e7b961cd081ac6a64b636937716ce3a623c2c
parent5e49037caa4cf9062efd0bbebf67b467684b633b
Merge branch 'gallium-0.1' into gallium-tex-surfaces
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/i915simple/i915_screen.c
src/gallium/drivers/softpipe/sp_context.c
src/gallium/winsys/xlib/xm_winsys.c
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_cb_texture.c