CVS import: xsrc/external/mit/xf86-video-r128/dist

2023-01-08 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 21:32:52 UTC 2023

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28909

Log Message:
initial import of xf86-video-r128-6.12.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-12-1

U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
C xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_rop.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am

4 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2023-01-08 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Jan  8 21:32:52 UTC 2023

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28909

Log Message:
initial import of xf86-video-r128-6.12.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-12-1

U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
C xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_rop.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am

4 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:05:33 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv14036

Log Message:
initial import of xf86-video-r128-6.12.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-12-0

U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
C xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_rop.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h

4 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2018-12-29 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Dec 30 06:05:33 UTC 2018

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv14036

Log Message:
initial import of xf86-video-r128-6.12.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-12-0

U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
C xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_rop.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h

4 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2017-03-04 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  5 01:19:57 UTC 2017

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28509

Log Message:
initial import of xf86-video-r128-6.10.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-2

U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2017-03-04 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  5 01:19:57 UTC 2017

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28509

Log Message:
initial import of xf86-video-r128-6.10.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-2

U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 03:04:43 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5750

Log Message:
initial import of xf86-video-r128-6.10.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-1

U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2016-08-14 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 03:04:43 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5750

Log Message:
initial import of xf86-video-r128-6.10.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-1

U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2015-07-19 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Mon Jul 20 00:23:09 UTC 2015

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10906

Log Message:
initial import of xf86-video-r128-6.10.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-10-0

U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
N xsrc/external/mit/xf86-video-r128/dist/compile
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2014-03-19 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 19 23:53:14 UTC 2014

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10159

Log Message:
initial import of xf86-video-r128-6.9.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-9-2

U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2014-03-19 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Wed Mar 19 23:53:14 UTC 2014

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10159

Log Message:
initial import of xf86-video-r128-6.9.2

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-9-2

U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2013-06-02 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Jun  2 08:24:22 UTC 2013

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23433

Log Message:
initial import of xf86-video-r128-6.9.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-9-1

N xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
N xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
N xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist



CVS import: xsrc/external/mit/xf86-video-r128/dist

2013-06-02 Thread matthew green
Module Name:xsrc
Committed By:   mrg
Date:   Sun Jun  2 08:24:22 UTC 2013

Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23433

Log Message:
initial import of xf86-video-r128-6.9.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-r128-6-9-1

N xsrc/external/mit/xf86-video-r128/dist/INSTALL
U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4
U xsrc/external/mit/xf86-video-r128/dist/config.sub
U xsrc/external/mit/xf86-video-r128/dist/ChangeLog
U xsrc/external/mit/xf86-video-r128/dist/COPYING
U xsrc/external/mit/xf86-video-r128/dist/config.h.in
U xsrc/external/mit/xf86-video-r128/dist/install-sh
U xsrc/external/mit/xf86-video-r128/dist/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh
U xsrc/external/mit/xf86-video-r128/dist/depcomp
U xsrc/external/mit/xf86-video-r128/dist/missing
U xsrc/external/mit/xf86-video-r128/dist/configure.ac
U xsrc/external/mit/xf86-video-r128/dist/README
U xsrc/external/mit/xf86-video-r128/dist/config.guess
U xsrc/external/mit/xf86-video-r128/dist/configure
U xsrc/external/mit/xf86-video-r128/dist/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/man/r128.man
U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h
U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c
C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
N xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c
U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c
N xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h
C xsrc/external/mit/xf86-video-r128/dist/src/r128.h
U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h
N xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c
U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg 
xsrc/external/mit/xf86-video-r128/dist