Merge tag 'mesa_7_5' into debian-experimental
Conflicts: progs/tests/.gitignore progs/tests/Makefile progs/tests/SConscript progs/trivial/Makefile scons/dxsdk.py scons/gallium.py
Showing
- Makefile 1 addition, 1 deletionMakefile
- configure.ac 1 addition, 1 deletionconfigure.ac
- docs/cell.html 1 addition, 1 deletiondocs/cell.html
- docs/news.html 9 additions, 1 deletiondocs/news.html
- docs/relnotes-7.5.html 4 additions, 2 deletionsdocs/relnotes-7.5.html
- progs/SConscript 1 addition, 0 deletionsprogs/SConscript
- progs/demos/isosurf.c 20 additions, 5 deletionsprogs/demos/isosurf.c
- progs/glsl/Makefile 1 addition, 1 deletionprogs/glsl/Makefile
- progs/glsl/array.c 8 additions, 11 deletionsprogs/glsl/array.c
- progs/glsl/bitmap.c 13 additions, 16 deletionsprogs/glsl/bitmap.c
- progs/glsl/brick.c 9 additions, 12 deletionsprogs/glsl/brick.c
- progs/glsl/bump.c 11 additions, 14 deletionsprogs/glsl/bump.c
- progs/glsl/convolutions.c 3 additions, 0 deletionsprogs/glsl/convolutions.c
- progs/glsl/deriv.c 9 additions, 12 deletionsprogs/glsl/deriv.c
- progs/glsl/fragcoord.c 9 additions, 12 deletionsprogs/glsl/fragcoord.c
- progs/glsl/identity.c 9 additions, 12 deletionsprogs/glsl/identity.c
- progs/glsl/linktest.c 26 additions, 29 deletionsprogs/glsl/linktest.c
- progs/glsl/mandelbrot.c 15 additions, 18 deletionsprogs/glsl/mandelbrot.c
- progs/glsl/multinoise.c 19 additions, 22 deletionsprogs/glsl/multinoise.c
- progs/glsl/multitex.c 18 additions, 19 deletionsprogs/glsl/multitex.c
Loading
Please register or sign in to comment