CVS: cvs.openbsd.org: xenocara

[Matthieu Herrb]

CVSROOT:        /cvs
Module name:    xenocara
Changes by:     matthieu@xxxxxxxxxxxxxxx        2007/12/10 14:10:28

Log message:
    pixman 0.9.6
    
    Status:
    
    Vendor Tag: xorg
    Release Tags:       v0_9_6
    
    U xenocara/lib/pixman/ltmain.sh
    C xenocara/lib/pixman/configure
    U xenocara/lib/pixman/INSTALL
    U xenocara/lib/pixman/aclocal.m4
    U xenocara/lib/pixman/TODO
    U xenocara/lib/pixman/pixman-1.pc.in
    U xenocara/lib/pixman/Makefile.am
    C xenocara/lib/pixman/configure.ac
    C xenocara/lib/pixman/config.sub
    U xenocara/lib/pixman/COPYING
    U xenocara/lib/pixman/ChangeLog
    U xenocara/lib/pixman/NEWS
    C xenocara/lib/pixman/config.guess
    U xenocara/lib/pixman/depcomp
    U xenocara/lib/pixman/README
    U xenocara/lib/pixman/config.h.in
    U xenocara/lib/pixman/missing
    U xenocara/lib/pixman/AUTHORS
    U xenocara/lib/pixman/Makefile.in
    U xenocara/lib/pixman/install-sh
    U xenocara/lib/pixman/pixman/pixman.h
    N xenocara/lib/pixman/pixman/pixman-edge-accessors.c
    U xenocara/lib/pixman/pixman/pixman-private.h
    U xenocara/lib/pixman/pixman/pixman-mmx.c
    U xenocara/lib/pixman/pixman/pixman-trap.c
    U xenocara/lib/pixman/pixman/pixman-pict.c
    U xenocara/lib/pixman/pixman/pixman-edge.c
    U xenocara/lib/pixman/pixman/pixman-mmx.h
    U xenocara/lib/pixman/pixman/pixman-region.c
    U xenocara/lib/pixman/pixman/Makefile.am
    U xenocara/lib/pixman/pixman/pixman-compose.c
    U xenocara/lib/pixman/pixman/pixman-image.c
    N xenocara/lib/pixman/pixman/pixman-compose-accessors.c
    U xenocara/lib/pixman/pixman/pixman-utils.c
    U xenocara/lib/pixman/pixman/pixman-edge-imp.h
    U xenocara/lib/pixman/pixman/pixman-timer.c
    C xenocara/lib/pixman/pixman/Makefile.in
    U xenocara/lib/pixman/pixman/pixman-compute-region.c
    U xenocara/lib/pixman/test/composite-test.c
    U xenocara/lib/pixman/test/gradient-test.c
    U xenocara/lib/pixman/test/Makefile.am
    U xenocara/lib/pixman/test/Makefile.in
    
    5 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jxorg:yesterday -jxorg xenocara/lib/pixman