projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb64c9b 9dbd47f)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 8 Dec 2009 01:16:10 +0000 (17:16 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 8 Dec 2009 01:16:10 +0000 (17:16 -0800)
commit8fc433fa0f8c5364454858f9be919387feda440c
treeec4fd82af464123acbef1f16212aa44e8f9fddd1tree
parentbb64c9bcdf9962c4f74d71f49307de1da4c3392bcommit | diff
parent9dbd47fc6b1cf9ddfb318f2e05df0886cd5fe0dfcommit | diff
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h

To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch.  The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
src/gallium/drivers/r300/Makefile diff1 | diff2 | blob | history
src/mesa/drivers/dri/radeon/radeon_common.c diff1 | diff2 | blob | history
src/mesa/drivers/dri/radeon/radeon_common.h diff1 | diff2 | blob | history