Brian Paul a18e209edb Merge branch 'mesa_7_5_branch' ... Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h		2009-06-26 17:07:07 -06:00
..
pipe	Merge branch 'mesa_7_5_branch'	2009-06-26 17:07:07 -06:00
state_tracker	gallium: Add a dri1 api	2009-04-28 11:45:36 +02:00