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	2007/11/24 14:10:33

Log message:
    xf86-input-magellan 1.1.1
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v1_1_1
    
    U xenocara/driver/xf86-input-magellan/configure.ac
    C xenocara/driver/xf86-input-magellan/aclocal.m4
    U xenocara/driver/xf86-input-magellan/Makefile.am
    C xenocara/driver/xf86-input-magellan/Makefile.in
    C xenocara/driver/xf86-input-magellan/config.h.in
    C xenocara/driver/xf86-input-magellan/configure
    U xenocara/driver/xf86-input-magellan/COPYING
    U xenocara/driver/xf86-input-magellan/ChangeLog
    C xenocara/driver/xf86-input-magellan/config.guess
    C xenocara/driver/xf86-input-magellan/config.sub
    U xenocara/driver/xf86-input-magellan/depcomp
    U xenocara/driver/xf86-input-magellan/install-sh
    C xenocara/driver/xf86-input-magellan/ltmain.sh
    U xenocara/driver/xf86-input-magellan/missing
    U xenocara/driver/xf86-input-magellan/src/Makefile.am
    C xenocara/driver/xf86-input-magellan/src/Makefile.in
    U xenocara/driver/xf86-input-magellan/src/magellan.c
    U xenocara/driver/xf86-input-magellan/src/magellan.h
    C xenocara/driver/xf86-input-magellan/man/Makefile.am
    C xenocara/driver/xf86-input-magellan/man/Makefile.in
    
    10 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/driver/xf86-input-magellan