Brian Paul 2689dd304c Merge branch '7.8' ... Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h		2010-03-23 09:14:17 -06:00
..
mesa	Merge branch '7.8'	2010-03-23 09:14:17 -06:00
progs	windows: fix compilation errors and warnings	2010-03-10 15:58:10 -07:00