projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed4076b 82c2f77)
Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Sun, 20 Sep 2009 16:36:45 +0000 (10:36 -0600)
committerBrian Paul <brianp@vmware.com>
Sun, 20 Sep 2009 16:36:45 +0000 (10:36 -0600)
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c

1  2 
src/mesa/drivers/common/meta.c patch | diff1 | diff2 | blob | history
src/mesa/state_tracker/st_cb_texture.c patch | diff1 | diff2 | blob | history

diff --cc src/mesa/drivers/common/meta.c
Simple merge