projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb640c8 e128cc2)
Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 17:04:07 +0000 (10:04 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 11 Dec 2009 17:04:07 +0000 (10:04 -0700)
commita087eb590d780cb82b49464e05ffc85123adce7e
treea2ac3ec2cc0b9001b350664d6e7915aba5e087a9tree
parentcb640c8d40c4ee34160a14d646c244f44a5013f6commit | diff
parente128cc205e30540597ecd57849060a6bf4714d9fcommit | diff
Merge branch 'mesa_7_7_branch'

Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
17 files changed:
src/gallium/drivers/svga/svga_screen_texture.c diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_screen_texture.h diff1 | diff2 | blob | history
src/gallium/drivers/svga/svga_state_constants.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_crtc.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_xv.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i830_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i830_vtbl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_vtbl.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_blit.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/intel/intel_span.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r600/r700_chip.c diff1 | diff2 | blob | history
src/mesa/main/context.c diff1 | diff2 | blob | history
src/mesa/main/get.c diff1 | diff2 | blob | history
src/mesa/main/get_gen.py diff1 | diff2 | blob | history
src/mesa/main/mtypes.h diff1 | diff2 | blob | history
src/mesa/main/texobj.c diff1 | diff2 | blob | history