CVS Update: xc (branch: trunk)

[Kevin E Martin]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	kem at gabe.freedesktop.org	05/11/30 19:44:55

Log message:
  Resolve Mesa 6.4.1 import conflicts

Modified files:
      xc/extras/Mesa/src/mesa/drivers/dri/common/:
        dri_util.c 
      xc/extras/Mesa/src/mesa/drivers/dri/i915/:
        i915_fragprog.c 
Removed files:
      xc/extras/Mesa/src/mesa/drivers/dri/dri_client/:
        Makefile xf86drm.c xf86drmHash.c xf86drmRandom.c 
        xf86drmSL.c 
      xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/:
        xf86drm.h 
  
  Revision      Changes    Path
  1.6           +3 -3      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.4           +2 -2      xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_fragprog.c