Skip to content
  • Brian Paul's avatar
    Merge branch '7.8' · 2689dd30
    Brian Paul authored
    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
    2689dd30