Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts: scons/gallium.py scons/generic.py src/mesa/main/version.h
This commit is contained in:
commit
48302e9b30
Conflicts: scons/gallium.py scons/generic.py src/mesa/main/version.h