Skip to content
Snippets Groups Projects
Commit 753604e6 authored by Brice Goglin's avatar Brice Goglin
Browse files

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
parents f8f07cb9 86cd188f
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment