CVS: cvs.openbsd.org: xenocara

[Matthieu Herrb <matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org>]

CVSROOT:	/cvs
Module name:	xenocara
Changes by:	matthieu_(_at_)_cvs_(_dot_)_openbsd_(_dot_)_org	2008/01/12 09:29:32

Log message:
    xf86-video-nv 2.1.6
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v2_1_6
    
    U xenocara/driver/xf86-video-nv/configure.ac
    U xenocara/driver/xf86-video-nv/aclocal.m4
    U xenocara/driver/xf86-video-nv/Makefile.am
    U xenocara/driver/xf86-video-nv/Makefile.in
    U xenocara/driver/xf86-video-nv/config.h.in
    C xenocara/driver/xf86-video-nv/configure
    U xenocara/driver/xf86-video-nv/COPYING
    U xenocara/driver/xf86-video-nv/ChangeLog
    U xenocara/driver/xf86-video-nv/config.guess
    U xenocara/driver/xf86-video-nv/config.sub
    U xenocara/driver/xf86-video-nv/depcomp
    U xenocara/driver/xf86-video-nv/install-sh
    U xenocara/driver/xf86-video-nv/ltmain.sh
    U xenocara/driver/xf86-video-nv/missing
    U xenocara/driver/xf86-video-nv/README.NV1
    U xenocara/driver/xf86-video-nv/README.G80
    U xenocara/driver/xf86-video-nv/src/Makefile.am
    C xenocara/driver/xf86-video-nv/src/Makefile.in
    U xenocara/driver/xf86-video-nv/src/nv_const.h
    U xenocara/driver/xf86-video-nv/src/nv_cursor.c
    U xenocara/driver/xf86-video-nv/src/nv_dac.c
    U xenocara/driver/xf86-video-nv/src/nv_dga.c
    U xenocara/driver/xf86-video-nv/src/nv_dma.h
    U xenocara/driver/xf86-video-nv/src/nv_driver.c
    U xenocara/driver/xf86-video-nv/src/nv_hw.c
    U xenocara/driver/xf86-video-nv/src/nv_include.h
    U xenocara/driver/xf86-video-nv/src/nv_local.h
    U xenocara/driver/xf86-video-nv/src/nv_proto.h
    U xenocara/driver/xf86-video-nv/src/nv_setup.c
    U xenocara/driver/xf86-video-nv/src/nv_shadow.c
    U xenocara/driver/xf86-video-nv/src/nv_type.h
    U xenocara/driver/xf86-video-nv/src/nv_video.c
    U xenocara/driver/xf86-video-nv/src/nv_xaa.c
    U xenocara/driver/xf86-video-nv/src/riva_const.h
    U xenocara/driver/xf86-video-nv/src/riva_cursor.c
    U xenocara/driver/xf86-video-nv/src/riva_dac.c
    U xenocara/driver/xf86-video-nv/src/riva_dga.c
    U xenocara/driver/xf86-video-nv/src/riva_driver.c
    U xenocara/driver/xf86-video-nv/src/riva_hw.c
    U xenocara/driver/xf86-video-nv/src/riva_hw.h
    U xenocara/driver/xf86-video-nv/src/riva_include.h
    U xenocara/driver/xf86-video-nv/src/riva_local.h
    U xenocara/driver/xf86-video-nv/src/riva_proto.h
    U xenocara/driver/xf86-video-nv/src/riva_setup.c
    U xenocara/driver/xf86-video-nv/src/riva_shadow.c
    U xenocara/driver/xf86-video-nv/src/riva_tbl.h
    U xenocara/driver/xf86-video-nv/src/riva_type.h
    U xenocara/driver/xf86-video-nv/src/riva_xaa.c
    U xenocara/driver/xf86-video-nv/src/g80_cursor.c
    U xenocara/driver/xf86-video-nv/src/g80_cursor.h
    U xenocara/driver/xf86-video-nv/src/g80_dac.c
    C xenocara/driver/xf86-video-nv/src/g80_display.c
    U xenocara/driver/xf86-video-nv/src/g80_display.h
    U xenocara/driver/xf86-video-nv/src/g80_dma.c
    U xenocara/driver/xf86-video-nv/src/g80_dma.h
    U xenocara/driver/xf86-video-nv/src/g80_driver.c
    U xenocara/driver/xf86-video-nv/src/g80_exa.c
    U xenocara/driver/xf86-video-nv/src/g80_exa.h
    U xenocara/driver/xf86-video-nv/src/g80_output.c
    U xenocara/driver/xf86-video-nv/src/g80_output.h
    U xenocara/driver/xf86-video-nv/src/g80_sor.c
    U xenocara/driver/xf86-video-nv/src/g80_type.h
    U xenocara/driver/xf86-video-nv/src/g80_xaa.c
    U xenocara/driver/xf86-video-nv/src/g80_xaa.h
    U xenocara/driver/xf86-video-nv/src/local_xf86Rename.h
    U xenocara/driver/xf86-video-nv/man/Makefile.am
    U xenocara/driver/xf86-video-nv/man/Makefile.in
    U xenocara/driver/xf86-video-nv/man/nv.man
    U xenocara/driver/xf86-video-nv/compat/README
    U xenocara/driver/xf86-video-nv/compat/Makefile.am
    U xenocara/driver/xf86-video-nv/compat/Makefile.in
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Crtc.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Crtc.h
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Cursors.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86cvt.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86DiDGA.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86EdidModes.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Modes.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Modes.h
    U xenocara/driver/xf86-video-nv/compat/modes/xf86RandR12.c
    U xenocara/driver/xf86-video-nv/compat/modes/xf86RandR12.h
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Rename.h
    U xenocara/driver/xf86-video-nv/compat/modes/xf86Rotate.c
    U xenocara/driver/xf86-video-nv/compat/parser/xf86Parser.h
    U xenocara/driver/xf86-video-nv/compat/parser/xf86Optrec.h
    
    3 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/driver/xf86-video-nv