|  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 | 15 years ago | |
|---|---|---|
| .. | ||
| VC7 | glapi: Move src/mesa/main/dispatch.c to glapi and rename. | 15 years ago | 
| VC8 | Merge branch '7.8' | 15 years ago |