projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 11522b7 42d9409)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Dec 2009 17:09:51 +0000 (09:09 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 16 Dec 2009 17:09:51 +0000 (09:09 -0800)
commit006a526edb0f5a67679309a867a1af22d94e1687
tree85106f01665e2f3ee455d3d334a2444ea7ac6de1tree
parent11522b74b318db9d099466ff226124c23595e8e2commit | diff
parent42d94098737bbd52ce9bdcdec36dad32e6b7a0edcommit | diff
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
src/mesa/drivers/dri/unichrome/via_ioctl.c
src/mesa/drivers/dri/unichrome/via_screen.c
src/mesa/main/version.h
src/mesa/state_tracker/st_atom.c
src/mesa/main/compiler.h diff1 | diff2 | blob | history