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	2006/12/16 11:34:43

Log message:
    xf86-video-nv 1.2.1 from X.Org 7.2RC3
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v1_2_1
    
    U xenocara/driver/xf86-video-nv/configure.ac
    C 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/src/Makefile.am
    U 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/nvreg.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/nvvga.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/man/Makefile.am
    C xenocara/driver/xf86-video-nv/man/Makefile.in
    U xenocara/driver/xf86-video-nv/man/nv.man
    
    3 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/driver/xf86-video-nv