CVS Update: xc (branch: trunk)

[Kevin E Martin]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	kem at gabe.freedesktop.org	05/10/17 20:10:18

Log message:
  Resolve Mesa import conflicts

Modified files:
      xc/extras/Mesa/include/GL/:
        glxext.h 
      xc/extras/Mesa/src/glx/x11/:
        indirect_size.c indirect_size.h 
      xc/extras/Mesa/src/mesa/drivers/dri/common/:
        dri_util.c 
      xc/extras/Mesa/src/mesa/drivers/dri/i915/:
        intel_context.c intel_screen.c 
      xc/extras/Mesa/src/mesa/drivers/dri/r200/:
        r200_tcl.c 
      xc/extras/Mesa/src/mesa/main/:
        imports.h 
Removed files:
      xc/extras/Mesa/src/mesa/drivers/dri/r128/:
        r128_vb.c 
      xc/extras/Mesa/src/mesa/drivers/dri/unichrome/:
        via_dri.h 
  
  Revision      Changes    Path
  1.5           +2 -0      xc/extras/Mesa/include/GL/glxext.h
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/include/GL/glxext.h
  1.4           +5 -9      xc/extras/Mesa/src/glx/x11/indirect_size.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/glx/x11/indirect_size.c
  1.4           +2 -2      xc/extras/Mesa/src/glx/x11/indirect_size.h
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/glx/x11/indirect_size.h
  1.5           +1 -10     xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
  1.5           +1 -0      xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c
  1.4           +6 -5      xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_screen.c
  1.4           +2 -1      xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_tcl.c
  1.7           +12 -2     xc/extras/Mesa/src/mesa/main/imports.h
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/main/imports.h