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

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cc8a537 94b5c28)

author	Roland Scheidegger <sroland@vmware.com>
	Thu, 3 Dec 2009 23:35:14 +0000 (00:35 +0100)
committer	Roland Scheidegger <sroland@vmware.com>
	Thu, 3 Dec 2009 23:35:14 +0000 (00:35 +0100)
commit	9c6a9363ef96c00dd0ad63e340b32479e43fea45
tree	c1752752623301c7bc63d25173c396794b74922d	tree
parent	cc8a537c57a62a196106b592e510e4c93bd1826e	commit \| diff
parent	94b5c28a98850f42fbcdab9ceda1450279e1e6fd	commit \| diff

Merge branch 'gallium-noblocks'

Conflicts:
src/gallium/state_trackers/xorg/xorg_exa.c

14 files changed:

src/gallium/auxiliary/draw/draw_pipe_aaline.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/draw/draw_pipe_pstipple.c	diff1 \|	diff2 \|	blob \| history
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/r300/r300_screen.c	diff1 \|	diff2 \|	blob \| history
src/gallium/drivers/svga/svga_screen_texture.c	diff1 \|	diff2 \|	blob \| history
src/gallium/include/pipe/p_state.h	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/python/retrace/interpreter.py	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_crtc.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_dri2.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_exa.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_renderer.c	diff1 \|	diff2 \|	blob \| history
src/gallium/state_trackers/xorg/xorg_xv.c	diff1 \|	diff2 \|	blob \| history
src/gallium/winsys/xlib/xlib_cell.c	diff1 \|	diff2 \|	blob \| history
src/mesa/state_tracker/st_cb_drawpixels.c	diff1 \|	diff2 \|	blob \| history