Import

[ssiddiqi@sourceware.cygnus.com]

CVSROOT:	/cvs/src
Module name:	src
Changes by:	ssiddiqi@sourceware.cygnus.com	00/06/10 17:20:30

Log message:
    cygwin.cf update of cygwin-xfree
    
    Status:
    
    Vendor Tag:	SNAPSHOT
    Release Tags:	cygwin-xfree-2000-06-10
    
    U src/cygwin-xfree/programs/Xserver/hw/xwin/cfbcmap.c
    N src/cygwin-xfree/programs/Xserver/hw/xwin/ddraw.h
    C src/cygwin-xfree/programs/Xserver/hw/xwin/directx.c
    U src/cygwin-xfree/programs/Xserver/hw/xwin/Imakefile
    U src/cygwin-xfree/programs/Xserver/hw/xwin/InitInput.c
    C src/cygwin-xfree/programs/Xserver/hw/xwin/InitOutput.c
    U src/cygwin-xfree/programs/Xserver/hw/xwin/InitOutput.c-peter
    U src/cygwin-xfree/programs/Xserver/hw/xwin/linkxwin.sh
    N src/cygwin-xfree/programs/Xserver/hw/xwin/makefile
    N src/cygwin-xfree/programs/Xserver/hw/xwin/ntux_ddx.h
    N src/cygwin-xfree/programs/Xserver/hw/xwin/ntux_xf.c
    U src/cygwin-xfree/programs/Xserver/hw/xwin/winkeymap.h
    U src/cygwin-xfree/programs/Xserver/hw/xwin/winkeynames.h
    U src/cygwin-xfree/programs/Xserver/hw/xwin/x.sh
    N src/cygwin-xfree/programs/Xserver/hw/xwin/xf_dx_xwin.h
    
    2 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jSNAPSHOT:yesterday -jSNAPSHOT src/cygwin-xfree/programs/Xserver/hw/xwin