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

Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable

Conflicts:
	progs/tests/Makefile
	progs/tests/prog_parameter.c
parents 1f471355 7d41b424
No related merge requests found
Showing
with 85 additions and 45 deletions
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