|  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 година | |
|---|---|---|
| .. | ||
| mesa | Merge branch '7.8' | пре 15 година | 
| progs | windows: fix compilation errors and warnings | пре 15 година |