projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae1c0a0 b57abd3)
Merge branch 'mesa_7_7_branch'
authorBrian Paul <brianp@vmware.com>
Tue, 22 Dec 2009 01:35:54 +0000 (18:35 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 22 Dec 2009 01:35:54 +0000 (18:35 -0700)
commit9eb7fc6661a1d46c06cec8584b898e3e690af6fa
tree78ed4336c613303ef02691baf4d89e7330a0f6cftree
parentae1c0a06e81b8c6f015a3b64616a5d3a989f9373commit | diff
parentb57abd3bea29e95e5dee2524c3f1be4b26017c0fcommit | diff
Merge branch 'mesa_7_7_branch'

Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
19 files changed:
Makefile diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
progs/demos/readpix.c diff1 | diff2 | blob | history
progs/demos/textures.c diff1 | diff2 | blob | history
src/gallium/state_trackers/xorg/xorg_exa.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/i915/i915_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r128/r128_tris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/r300/r300_texstate.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/savage/savagetris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/sis/sis_tris.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/unichrome/via_tris.c diff1 | diff2 | blob | history
src/mesa/shader/slang/slang_compile.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_draw.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_gen_mipmap.c diff1 | diff2 | blob | history
src/mesa/state_tracker/st_program.c diff1 | diff2 | blob | history
src/mesa/swrast_setup/ss_tritmp.h diff1 | diff2 | blob | history
src/mesa/tnl_dd/t_dd_dmatmp.h diff1 | diff2 | blob | history
src/mesa/tnl_dd/t_dd_tritmp.h diff1 | diff2 | blob | history