projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
src/mesa/main/compiler.h patch | diff1 | diff2 | blob | history

diff --cc src/mesa/main/compiler.h
Simple merge