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 09:20:18

Log message:
    inputproto 1.4.2.1
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v1_4_2_1
    
    U xenocara/proto/inputproto/configure.ac
    C xenocara/proto/inputproto/aclocal.m4
    U xenocara/proto/inputproto/XI.h
    U xenocara/proto/inputproto/XInput.h
    U xenocara/proto/inputproto/XIproto.h
    U xenocara/proto/inputproto/Makefile.am
    C xenocara/proto/inputproto/Makefile.in
    U xenocara/proto/inputproto/inputproto.pc.in
    C xenocara/proto/inputproto/configure
    U xenocara/proto/inputproto/COPYING
    U xenocara/proto/inputproto/ChangeLog
    C xenocara/proto/inputproto/install-sh
    C xenocara/proto/inputproto/missing
    U xenocara/proto/inputproto/autogen.sh
    
    5 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/proto/inputproto