| commit | 8fc433fa0f8c5364454858f9be919387feda440c | [log] [tgz] |
|---|---|---|
| author | Ian Romanick <ian.d.romanick@intel.com> | Mon Dec 07 17:16:10 2009 -0800 |
| committer | Ian Romanick <ian.d.romanick@intel.com> | Mon Dec 07 17:16:10 2009 -0800 |
| tree | ec4fd82af464123acbef1f16212aa44e8f9fddd1 | |
| parent | bb64c9bcdf9962c4f74d71f49307de1da4c3392b [diff] | |
| parent | 9dbd47fc6b1cf9ddfb318f2e05df0886cd5fe0df [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.