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:18:33

Log message:
    util-macros 1.1.3 from X.Org 7.2RC3
    
    Status:
    
    Vendor Tag:	xorg
    Release Tags:	v1_1_3
    
    U xenocara/util/macros/README
    U xenocara/util/macros/configure.ac
    U xenocara/util/macros/aclocal.m4
    U xenocara/util/macros/Makefile.am
    U xenocara/util/macros/Makefile.in
    U xenocara/util/macros/xorg-macros.m4.in
    C xenocara/util/macros/configure
    U xenocara/util/macros/COPYING
    U xenocara/util/macros/ChangeLog
    U xenocara/util/macros/install-sh
    U xenocara/util/macros/missing
    U xenocara/util/macros/xorgversion.m4
    U xenocara/util/macros/xorg-macros.m4
    
    1 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/util/macros