Merge branch 'mesa_7_5_branch'

Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
2009-07-17 22:00:47 -06:00
parent f81f57e25d cd10996d4f
commit b96ae1b2c4
44 changed files with 775 additions and 470 deletions
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -38,6 +38,8 @@ import SCons.Action
 import SCons.Builder
 import SCons.Scanner

+import fixes
+

 def quietCommandLines(env):
    # Quiet command lines