git.libre-soc.org Git - mesa.git/commit

author	Keith Whitwell <keithw@vmware.com>
	Mon, 16 Feb 2009 19:50:48 +0000 (19:50 +0000)
committer	Keith Whitwell <keithw@vmware.com>
	Mon, 16 Feb 2009 19:50:48 +0000 (19:50 +0000)
commit	59d54334c96f44ed1d8bf660dc96221362a77d04
tree	e9ab34e568256bcdc2a88602c47072ab769211e8	tree
parent	7c8836e9ef49d938aa55a1c385b95c6371c301f1	commit \| diff
parent	c5c383596ddb26cd75e4b355918ad16915283b59	commit \| diff

Merge branch 'master' into gallium-texture-transfer

Conflicts:

src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c

src/gallium/auxiliary/draw/draw_pipe_pstipple.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_draw_arrays.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/softpipe/sp_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_screen.h	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_accum.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_bitmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_fbo.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_texture.c	diff1 \|	diff2 \|	blob \| history