Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 6 May 2008 06:45:28 +0000 (07:45 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 6 May 2008 06:45:28 +0000 (07:45 +0100)
commit09e6be9b5782870f1f225653687e0d3e7be2a5a9
tree67215a913d51451b3a3d52f3f0815d4c81f4ff2b
parent6361d6f48d13ce481253faf106fba5c6a41488ed
parentf77442fbd3b539aa3da927630c12c3a1a377f6da
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces

Conflicts:

src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/gallium/include/pipe/p_defines.h
src/gallium/winsys/xlib/xm_winsys.c
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_texture.h