CVS Update: xc (branch: trunk)

[Kevin E Martin]

CVSROOT:	/cvs/xorg
Module name:	xc
Changes by:	kem at gabe.freedesktop.org	05/11/08 17:56:34

Log message:
  Resolve Mesa import conflicts

Modified files:
      xc/extras/Mesa/src/mesa/drivers/dri/sis/:
        sis_screen.c 
      xc/extras/Mesa/src/mesa/main/:
        imports.h 
Added files:
      xc/extras/Mesa/src/mesa/glapi/:
        .cvsignore 
Removed files:
      xc/extras/Mesa/include/:
        GLView.h 
      xc/extras/Mesa/src/egl/:
        Makefile 
      xc/extras/Mesa/src/egl/drivers/demo/:
        Makefile demo.c 
      xc/extras/Mesa/src/egl/drivers/dri/:
        Makefile egldri.c egldri.h 
      xc/extras/Mesa/src/egl/main/:
        Makefile eglapi.c eglconfig.c eglconfig.h eglcontext.c 
        eglcontext.h egldisplay.c egldisplay.h egldriver.c 
        egldriver.h eglglobals.c eglglobals.h eglhash.c eglhash.h 
        eglmode.c eglmode.h eglscreen.c eglscreen.h eglsurface.c 
        eglsurface.h egltypedefs.h 
      xc/extras/Mesa/src/mesa/drivers/beos/:
        GLView.cpp Makefile 
      xc/extras/Mesa/src/mesa/drivers/d3d/:
        D3DCAPS.CPP D3DHAL.H D3DInit.cpp D3DMESA.H D3DRaster.cpp 
        D3DShared.h D3DTEXT.CPP D3DTextureMgr.cpp D3DTextureMgr.h 
        D3DUTILS.CPP D3Dvbrender.c DDrawPROCS.c DEBUG.C DEBUG.H 
        DbgEnv.bat MAKEFILE NULLProcs.h NullProcs.c OPENGL32.DEF 
        WGL.C d3dText.h 
      xc/extras/Mesa/src/mesa/drivers/dos/:
        blit.S dmesa.c dpmi.c internal.h null.c null.h vesa.c 
        vesa.h vga.c vga.h video.c video.h virtual.S 
      xc/extras/Mesa/src/mesa/drivers/dri/common/:
        mm.c mm.h 
      xc/extras/Mesa/src/mesa/drivers/dri/unichrome/:
        via_common.h 
  
  Revision      Changes    Path
  1.3           +11 -0     xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_screen.c
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/drivers/dri/sis/sis_screen.c
  1.8           +11 -1     xc/extras/Mesa/src/mesa/main/imports.h
  http://cvs.freedesktop.org/xorg/xc/extras/Mesa/src/mesa/main/imports.h