Merge tag 'mesa_7_6' into debian-unstable
Conflicts: progs/egl/Makefile progs/egl/demo3.c progs/slang/vstest.c progs/tests/Makefile progs/tests/SConscript progs/tests/bufferobj.c progs/tests/floattex.c progs/tests/getprocaddress.c progs/tests/getprocaddress.py progs/tests/mapbufrange.c progs/tests/mapvbo.c progs/tests/texcmp.c progs/tests/texcompsub.c progs/tests/zreaddraw.c progs/trivial/.gitignore progs/vp/arl-static.txt progs/vp/arl-unused.txt progs/vp/vp-tris.c scons/gallium.py
No related branches found
No related tags found
Showing
- Makefile 7 additions, 2 deletionsMakefile
- SConstruct 4 additions, 4 deletionsSConstruct
- common.py 2 additions, 2 deletionscommon.py
- configs/autoconf.in 3 additions, 0 deletionsconfigs/autoconf.in
- configs/darwin 1 addition, 1 deletionconfigs/darwin
- configs/default 10 additions, 6 deletionsconfigs/default
- configs/linux-llvm 13 additions, 6 deletionsconfigs/linux-llvm
- configs/linux-x86-64-debug 1 addition, 0 deletionsconfigs/linux-x86-64-debug
- configure.ac 23 additions, 9 deletionsconfigure.ac
- docs/dispatch.html 1 addition, 1 deletiondocs/dispatch.html
- docs/envvars.html 3 additions, 0 deletionsdocs/envvars.html
- docs/openvg.html 68 additions, 0 deletionsdocs/openvg.html
- docs/relnotes-7.5.1.html 9 additions, 1 deletiondocs/relnotes-7.5.1.html
- docs/relnotes-7.5.2.html 60 additions, 0 deletionsdocs/relnotes-7.5.2.html
- docs/relnotes-7.6.html 84 additions, 0 deletionsdocs/relnotes-7.6.html
- docs/relnotes.html 2 additions, 0 deletionsdocs/relnotes.html
- include/EGL/eglplatform.h 2 additions, 1 deletioninclude/EGL/eglplatform.h
- include/GL/gl.h 5 additions, 71 deletionsinclude/GL/gl.h
- include/GL/gl_mangle.h 33 additions, 1 deletioninclude/GL/gl_mangle.h
- include/GL/glext.h 741 additions, 149 deletionsinclude/GL/glext.h
Loading
Please register or sign in to comment