From: Ian Romanick Date: Tue, 8 Dec 2009 01:16:10 +0000 (-0800) Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8fc433fa0f8c5364454858f9be919387feda440c;p=mesa.git 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. --- 8fc433fa0f8c5364454858f9be919387feda440c