• Brian Paul's avatar
    Merge branch 'mesa_7_5_branch' · b96ae1b2
    Brian Paul authored
    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
    b96ae1b2
Name
Last commit
Last update
..
beos Loading commit data...
demos Loading commit data...
directfb Loading commit data...
egl Loading commit data...
fbdev Loading commit data...
fp Loading commit data...
ggi Loading commit data...
glsl Loading commit data...
images Loading commit data...
miniglx Loading commit data...
openvg Loading commit data...
osdemos Loading commit data...
rbug Loading commit data...
redbook Loading commit data...
samples Loading commit data...
slang Loading commit data...
tests Loading commit data...
tools/trace Loading commit data...
trivial Loading commit data...
util Loading commit data...
vp Loading commit data...
vpglsl Loading commit data...
wgl Loading commit data...
windml Loading commit data...
xdemos Loading commit data...
Makefile Loading commit data...
SConscript Loading commit data...
SConstruct Loading commit data...