CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sun Feb 23 09:57:48 UTC 2020 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9897 Log Message: initial import of libpciaccess-0.16 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-16 U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/README.md U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.h U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/hurd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c No conflicts created by this import
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sun Mar 11 10:36:35 UTC 2018 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28523 Log Message: initial import of libpciaccess-0.14 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-14 U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Tue Aug 29 05:51:15 UTC 2017 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15976 Log Message: initial import of libpciaccess-0.13.5 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-5 U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 C xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c C xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:31:15 UTC 2015 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19793 Log Message: initial import of libpciaccess-0.13.4 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-4 U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Mar 17 02:05:34 UTC 2014 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17563 Log Message: initial import of libpciaccess-0.13.2 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-2 U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/AUTHORS N xsrc/external/mit/libpciaccess/dist/compile C xsrc/external/mit/libpciaccess/dist/src/common_device_name.c C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/man/Makefile.in 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 08:59:19 UTC 2013 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29630 Log Message: initial import of libpciaccess-0.13.1 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-1 U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 C xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 U xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 C xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4 C xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 C xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4 U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_capability.c C xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/man/Makefile.am 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist