Ian Romanick 650e02003f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch ... Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h		2009-11-30 17:47:07 -08:00
..
VC7	Merge branch 'texformat-rework'	2009-10-28 21:24:11 -06:00
VC8	Merge branch 'mesa_7_6_branch'	2009-11-04 17:57:20 -07:00