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 10:54:07

Log message:
    xfs 1.0.4 from X.Org 7.2RC3
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v1_0_4
    
    U xenocara/app/xfs/README
    U xenocara/app/xfs/configure.ac
    C xenocara/app/xfs/aclocal.m4
    U xenocara/app/xfs/Makefile.am
    C xenocara/app/xfs/Makefile.in
    U xenocara/app/xfs/config.h.in
    C xenocara/app/xfs/configure
    U xenocara/app/xfs/AUTHORS
    U xenocara/app/xfs/COPYING
    U xenocara/app/xfs/ChangeLog
    U xenocara/app/xfs/INSTALL
    U xenocara/app/xfs/NEWS
    U xenocara/app/xfs/config.guess
    U xenocara/app/xfs/config.sub
    U xenocara/app/xfs/depcomp
    U xenocara/app/xfs/install-sh
    U xenocara/app/xfs/missing
    U xenocara/app/xfs/xfs.def
    U xenocara/app/xfs/config.cpp
    U xenocara/app/xfs/xfs.man
    U xenocara/app/xfs/difs/atom.c
    U xenocara/app/xfs/difs/cache.c
    U xenocara/app/xfs/difs/charinfo.c
    U xenocara/app/xfs/difs/difsutils.c
    U xenocara/app/xfs/difs/dispatch.c
    U xenocara/app/xfs/difs/events.c
    U xenocara/app/xfs/difs/extensions.c
    U xenocara/app/xfs/difs/fontinfo.c
    U xenocara/app/xfs/difs/fonts.c
    U xenocara/app/xfs/difs/globals.c
    U xenocara/app/xfs/difs/initfonts.c
    U xenocara/app/xfs/difs/main.c
    U xenocara/app/xfs/difs/resource.c
    U xenocara/app/xfs/difs/swaprep.c
    U xenocara/app/xfs/difs/swapreq.c
    U xenocara/app/xfs/difs/tables.c
    U xenocara/app/xfs/os/access.c
    U xenocara/app/xfs/os/config.c
    U xenocara/app/xfs/os/config.h
    U xenocara/app/xfs/os/configstr.h
    U xenocara/app/xfs/os/connection.c
    U xenocara/app/xfs/os/daemon.c
    U xenocara/app/xfs/os/error.c
    U xenocara/app/xfs/os/io.c
    U xenocara/app/xfs/os/osdep.h
    U xenocara/app/xfs/os/osglue.c
    U xenocara/app/xfs/os/osinit.c
    U xenocara/app/xfs/os/utils.c
    U xenocara/app/xfs/os/waitfor.c
    U xenocara/app/xfs/os/xfstrans.c
    U xenocara/app/xfs/include/access.h
    U xenocara/app/xfs/include/accstr.h
    U xenocara/app/xfs/include/assert.h
    U xenocara/app/xfs/include/auth.h
    U xenocara/app/xfs/include/authstr.h
    U xenocara/app/xfs/include/cache.h
    U xenocara/app/xfs/include/cachestr.h
    U xenocara/app/xfs/include/client.h
    U xenocara/app/xfs/include/clientstr.h
    U xenocara/app/xfs/include/closestr.h
    U xenocara/app/xfs/include/closure.h
    U xenocara/app/xfs/include/difsfn.h
    U xenocara/app/xfs/include/difsfnst.h
    U xenocara/app/xfs/include/difs.h
    U xenocara/app/xfs/include/difsutils.h
    U xenocara/app/xfs/include/dispatch.h
    U xenocara/app/xfs/include/extentst.h
    U xenocara/app/xfs/include/fsevents.h
    U xenocara/app/xfs/include/fsresource.h
    U xenocara/app/xfs/include/globals.h
    U xenocara/app/xfs/include/misc.h
    U xenocara/app/xfs/include/os.h
    U xenocara/app/xfs/include/osstruct.h
    U xenocara/app/xfs/include/servermd.h
    U xenocara/app/xfs/include/site.h
    U xenocara/app/xfs/include/swaprep.h
    U xenocara/app/xfs/include/swapreq.h
    
    3 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/app/xfs