Index: projects/netbsd-tests-update-12/MAINTAINERS =================================================================== --- projects/netbsd-tests-update-12/MAINTAINERS (revision 305317) +++ projects/netbsd-tests-update-12/MAINTAINERS (revision 305318) Property changes on: projects/netbsd-tests-update-12/MAINTAINERS ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/MAINTAINERS:r303899-305031 Index: projects/netbsd-tests-update-12/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print =================================================================== --- projects/netbsd-tests-update-12/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print (revision 305317) +++ projects/netbsd-tests-update-12/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print (revision 305318) Property changes on: projects/netbsd-tests-update-12/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/amd =================================================================== --- projects/netbsd-tests-update-12/contrib/amd (revision 305317) +++ projects/netbsd-tests-update-12/contrib/amd (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/amd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/amd:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/apr =================================================================== --- projects/netbsd-tests-update-12/contrib/apr (revision 305317) +++ projects/netbsd-tests-update-12/contrib/apr (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/apr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/apr:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/apr-util =================================================================== --- projects/netbsd-tests-update-12/contrib/apr-util (revision 305317) +++ projects/netbsd-tests-update-12/contrib/apr-util (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/apr-util ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/apr-util:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/atf =================================================================== --- projects/netbsd-tests-update-12/contrib/atf (revision 305317) +++ projects/netbsd-tests-update-12/contrib/atf (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/atf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/atf:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/binutils =================================================================== --- projects/netbsd-tests-update-12/contrib/binutils (revision 305317) +++ projects/netbsd-tests-update-12/contrib/binutils (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/binutils ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/binutils:r304816-305031 Index: projects/netbsd-tests-update-12/contrib/bmake =================================================================== --- projects/netbsd-tests-update-12/contrib/bmake (revision 305317) +++ projects/netbsd-tests-update-12/contrib/bmake (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/bmake ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bmake:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/byacc =================================================================== --- projects/netbsd-tests-update-12/contrib/byacc (revision 305317) +++ projects/netbsd-tests-update-12/contrib/byacc (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/byacc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/byacc:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/bzip2 =================================================================== --- projects/netbsd-tests-update-12/contrib/bzip2 (revision 305317) +++ projects/netbsd-tests-update-12/contrib/bzip2 (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/bzip2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bzip2:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/com_err =================================================================== --- projects/netbsd-tests-update-12/contrib/com_err (revision 305317) +++ projects/netbsd-tests-update-12/contrib/com_err (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/com_err ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/com_err:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/compiler-rt =================================================================== --- projects/netbsd-tests-update-12/contrib/compiler-rt (revision 305317) +++ projects/netbsd-tests-update-12/contrib/compiler-rt (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/compiler-rt ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/compiler-rt:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/dialog =================================================================== --- projects/netbsd-tests-update-12/contrib/dialog (revision 305317) +++ projects/netbsd-tests-update-12/contrib/dialog (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/dialog ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/dialog:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/dma =================================================================== --- projects/netbsd-tests-update-12/contrib/dma (revision 305317) +++ projects/netbsd-tests-update-12/contrib/dma (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/dma ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/dma:r304816-305031 Index: projects/netbsd-tests-update-12/contrib/dtc =================================================================== --- projects/netbsd-tests-update-12/contrib/dtc (revision 305317) +++ projects/netbsd-tests-update-12/contrib/dtc (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/dtc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/dtc:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/ee =================================================================== --- projects/netbsd-tests-update-12/contrib/ee (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ee (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ee ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ee:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/elftoolchain/ar =================================================================== --- projects/netbsd-tests-update-12/contrib/elftoolchain/ar (revision 305317) +++ projects/netbsd-tests-update-12/contrib/elftoolchain/ar (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/elftoolchain/ar ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/elftoolchain/ar:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/elftoolchain/brandelf =================================================================== --- projects/netbsd-tests-update-12/contrib/elftoolchain/brandelf (revision 305317) +++ projects/netbsd-tests-update-12/contrib/elftoolchain/brandelf (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/elftoolchain/brandelf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/elftoolchain/brandelf:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/expat =================================================================== --- projects/netbsd-tests-update-12/contrib/expat (revision 305317) +++ projects/netbsd-tests-update-12/contrib/expat (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/expat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/expat:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/file =================================================================== --- projects/netbsd-tests-update-12/contrib/file (revision 305317) +++ projects/netbsd-tests-update-12/contrib/file (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/file ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/file:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/gcclibs/libgomp =================================================================== --- projects/netbsd-tests-update-12/contrib/gcclibs/libgomp (revision 305317) +++ projects/netbsd-tests-update-12/contrib/gcclibs/libgomp (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/gcclibs/libgomp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gcclibs/libgomp:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/gdb =================================================================== --- projects/netbsd-tests-update-12/contrib/gdb (revision 305317) +++ projects/netbsd-tests-update-12/contrib/gdb (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/gdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gdb:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/gdtoa =================================================================== --- projects/netbsd-tests-update-12/contrib/gdtoa (revision 305317) +++ projects/netbsd-tests-update-12/contrib/gdtoa (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/gdtoa ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gdtoa:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/groff =================================================================== --- projects/netbsd-tests-update-12/contrib/groff (revision 305317) +++ projects/netbsd-tests-update-12/contrib/groff (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/groff ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/groff:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/ipfilter =================================================================== --- projects/netbsd-tests-update-12/contrib/ipfilter (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ipfilter (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ipfilter ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ipfilter:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/ldns =================================================================== --- projects/netbsd-tests-update-12/contrib/ldns (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ldns (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ldns ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ldns:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/ldns-host =================================================================== --- projects/netbsd-tests-update-12/contrib/ldns-host (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ldns-host (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ldns-host ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ldns-host:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/less =================================================================== --- projects/netbsd-tests-update-12/contrib/less (revision 305317) +++ projects/netbsd-tests-update-12/contrib/less (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/less ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/less:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libarchive/cpio =================================================================== --- projects/netbsd-tests-update-12/contrib/libarchive/cpio (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libarchive/cpio (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libarchive/cpio ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libarchive/cpio:r304092-305031 Index: projects/netbsd-tests-update-12/contrib/libarchive/libarchive =================================================================== --- projects/netbsd-tests-update-12/contrib/libarchive/libarchive (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libarchive/libarchive (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libarchive/libarchive ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libarchive/libarchive:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/libarchive/libarchive_fe =================================================================== --- projects/netbsd-tests-update-12/contrib/libarchive/libarchive_fe (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libarchive/libarchive_fe (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libarchive/libarchive_fe ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libarchive/libarchive_fe:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libarchive/tar =================================================================== --- projects/netbsd-tests-update-12/contrib/libarchive/tar (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libarchive/tar (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libarchive/tar ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libarchive/tar:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/libarchive =================================================================== --- projects/netbsd-tests-update-12/contrib/libarchive (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libarchive (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libarchive ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libarchive:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/libc++ =================================================================== --- projects/netbsd-tests-update-12/contrib/libc++ (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libc++ (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libc++ ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libc++:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libc-vis =================================================================== --- projects/netbsd-tests-update-12/contrib/libc-vis (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libc-vis (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libc-vis ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libc-vis:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libcxxrt =================================================================== --- projects/netbsd-tests-update-12/contrib/libcxxrt (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libcxxrt (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libcxxrt ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libcxxrt:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libexecinfo =================================================================== --- projects/netbsd-tests-update-12/contrib/libexecinfo (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libexecinfo (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libexecinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libexecinfo:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libpcap =================================================================== --- projects/netbsd-tests-update-12/contrib/libpcap (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libpcap (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libpcap ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libpcap:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libstdc++ =================================================================== --- projects/netbsd-tests-update-12/contrib/libstdc++ (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libstdc++ (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libstdc++ ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libstdc++:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libucl =================================================================== --- projects/netbsd-tests-update-12/contrib/libucl (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libucl (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libucl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libucl:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/libxo =================================================================== --- projects/netbsd-tests-update-12/contrib/libxo (revision 305317) +++ projects/netbsd-tests-update-12/contrib/libxo (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/libxo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libxo:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/llvm/projects/libunwind =================================================================== --- projects/netbsd-tests-update-12/contrib/llvm/projects/libunwind (revision 305317) +++ projects/netbsd-tests-update-12/contrib/llvm/projects/libunwind (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/llvm/projects/libunwind ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/llvm/projects/libunwind:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/llvm/tools/clang =================================================================== --- projects/netbsd-tests-update-12/contrib/llvm/tools/clang (revision 305317) +++ projects/netbsd-tests-update-12/contrib/llvm/tools/clang (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/llvm/tools/clang ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/llvm/tools/clang:r304816-305031 Index: projects/netbsd-tests-update-12/contrib/llvm/tools/lldb =================================================================== --- projects/netbsd-tests-update-12/contrib/llvm/tools/lldb (revision 305317) +++ projects/netbsd-tests-update-12/contrib/llvm/tools/lldb (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/llvm/tools/lldb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/llvm/tools/lldb:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-dwarfdump =================================================================== --- projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-dwarfdump (revision 305317) +++ projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-dwarfdump (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-dwarfdump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/llvm/tools/llvm-dwarfdump:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-lto =================================================================== --- projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-lto (revision 305317) +++ projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-lto (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/llvm/tools/llvm-lto ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/llvm/tools/llvm-lto:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/mdocml =================================================================== --- projects/netbsd-tests-update-12/contrib/mdocml (revision 305317) +++ projects/netbsd-tests-update-12/contrib/mdocml (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/mdocml ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/mdocml:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/mtree =================================================================== --- projects/netbsd-tests-update-12/contrib/mtree (revision 305317) +++ projects/netbsd-tests-update-12/contrib/mtree (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/mtree ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/mtree:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/ncurses =================================================================== --- projects/netbsd-tests-update-12/contrib/ncurses (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ncurses (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ncurses ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ncurses:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/netbsd-tests =================================================================== --- projects/netbsd-tests-update-12/contrib/netbsd-tests (revision 305317) +++ projects/netbsd-tests-update-12/contrib/netbsd-tests (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/netbsd-tests ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/netbsd-tests:r305014-305031 Index: projects/netbsd-tests-update-12/contrib/netcat =================================================================== --- projects/netbsd-tests-update-12/contrib/netcat (revision 305317) +++ projects/netbsd-tests-update-12/contrib/netcat (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/netcat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/netcat:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/ntp =================================================================== --- projects/netbsd-tests-update-12/contrib/ntp (revision 305317) +++ projects/netbsd-tests-update-12/contrib/ntp (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/ntp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ntp:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/nvi =================================================================== --- projects/netbsd-tests-update-12/contrib/nvi (revision 305317) +++ projects/netbsd-tests-update-12/contrib/nvi (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/nvi ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/nvi:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/one-true-awk =================================================================== --- projects/netbsd-tests-update-12/contrib/one-true-awk (revision 305317) +++ projects/netbsd-tests-update-12/contrib/one-true-awk (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/one-true-awk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/one-true-awk:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/openbsm =================================================================== --- projects/netbsd-tests-update-12/contrib/openbsm (revision 305317) +++ projects/netbsd-tests-update-12/contrib/openbsm (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/openbsm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/openbsm:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/openpam =================================================================== --- projects/netbsd-tests-update-12/contrib/openpam (revision 305317) +++ projects/netbsd-tests-update-12/contrib/openpam (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/openpam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/openpam:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/openresolv =================================================================== --- projects/netbsd-tests-update-12/contrib/openresolv (revision 305317) +++ projects/netbsd-tests-update-12/contrib/openresolv (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/openresolv ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/openresolv:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/pf =================================================================== --- projects/netbsd-tests-update-12/contrib/pf (revision 305317) +++ projects/netbsd-tests-update-12/contrib/pf (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/pf:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/sendmail =================================================================== --- projects/netbsd-tests-update-12/contrib/sendmail (revision 305317) +++ projects/netbsd-tests-update-12/contrib/sendmail (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/sendmail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/sendmail:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/serf =================================================================== --- projects/netbsd-tests-update-12/contrib/serf (revision 305317) +++ projects/netbsd-tests-update-12/contrib/serf (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/serf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/serf:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/sqlite3 =================================================================== --- projects/netbsd-tests-update-12/contrib/sqlite3 (revision 305317) +++ projects/netbsd-tests-update-12/contrib/sqlite3 (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/sqlite3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/sqlite3:r304816-305031 Index: projects/netbsd-tests-update-12/contrib/subversion =================================================================== --- projects/netbsd-tests-update-12/contrib/subversion (revision 305317) +++ projects/netbsd-tests-update-12/contrib/subversion (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/subversion ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/subversion:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/tcpdump =================================================================== --- projects/netbsd-tests-update-12/contrib/tcpdump (revision 305317) +++ projects/netbsd-tests-update-12/contrib/tcpdump (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/tcpdump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tcpdump:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/tcsh =================================================================== --- projects/netbsd-tests-update-12/contrib/tcsh (revision 305317) +++ projects/netbsd-tests-update-12/contrib/tcsh (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/tcsh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tcsh:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/top/install-sh =================================================================== --- projects/netbsd-tests-update-12/contrib/top/install-sh (revision 305317) +++ projects/netbsd-tests-update-12/contrib/top/install-sh (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/top/install-sh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/top/install-sh:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/top =================================================================== --- projects/netbsd-tests-update-12/contrib/top (revision 305317) +++ projects/netbsd-tests-update-12/contrib/top (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/top ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/top:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/tzcode/stdtime =================================================================== --- projects/netbsd-tests-update-12/contrib/tzcode/stdtime (revision 305317) +++ projects/netbsd-tests-update-12/contrib/tzcode/stdtime (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/tzcode/stdtime ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tzcode/stdtime:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/tzcode/zic =================================================================== --- projects/netbsd-tests-update-12/contrib/tzcode/zic (revision 305317) +++ projects/netbsd-tests-update-12/contrib/tzcode/zic (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/tzcode/zic ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tzcode/zic:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/tzdata =================================================================== --- projects/netbsd-tests-update-12/contrib/tzdata (revision 305317) +++ projects/netbsd-tests-update-12/contrib/tzdata (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/tzdata ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tzdata:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/unbound =================================================================== --- projects/netbsd-tests-update-12/contrib/unbound (revision 305317) +++ projects/netbsd-tests-update-12/contrib/unbound (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/unbound ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/unbound:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/vis =================================================================== --- projects/netbsd-tests-update-12/contrib/vis (revision 305317) +++ projects/netbsd-tests-update-12/contrib/vis (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/vis ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/vis:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/wpa =================================================================== --- projects/netbsd-tests-update-12/contrib/wpa (revision 305317) +++ projects/netbsd-tests-update-12/contrib/wpa (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/wpa ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/wpa:r303899-305031 Index: projects/netbsd-tests-update-12/contrib/xz =================================================================== --- projects/netbsd-tests-update-12/contrib/xz (revision 305317) +++ projects/netbsd-tests-update-12/contrib/xz (revision 305318) Property changes on: projects/netbsd-tests-update-12/contrib/xz ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz:r303899-305031 Index: projects/netbsd-tests-update-12/crypto/heimdal =================================================================== --- projects/netbsd-tests-update-12/crypto/heimdal (revision 305317) +++ projects/netbsd-tests-update-12/crypto/heimdal (revision 305318) Property changes on: projects/netbsd-tests-update-12/crypto/heimdal ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/crypto/heimdal:r304816-305031 Index: projects/netbsd-tests-update-12/crypto/openssl =================================================================== --- projects/netbsd-tests-update-12/crypto/openssl (revision 305317) +++ projects/netbsd-tests-update-12/crypto/openssl (revision 305318) Property changes on: projects/netbsd-tests-update-12/crypto/openssl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/crypto/openssl:r304816-305031 Index: projects/netbsd-tests-update-12/gnu/usr.bin/binutils =================================================================== --- projects/netbsd-tests-update-12/gnu/usr.bin/binutils (revision 305317) +++ projects/netbsd-tests-update-12/gnu/usr.bin/binutils (revision 305318) Property changes on: projects/netbsd-tests-update-12/gnu/usr.bin/binutils ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/binutils:r303899-305031 Index: projects/netbsd-tests-update-12/gnu/usr.bin/cc/cc_tools =================================================================== --- projects/netbsd-tests-update-12/gnu/usr.bin/cc/cc_tools (revision 305317) +++ projects/netbsd-tests-update-12/gnu/usr.bin/cc/cc_tools (revision 305318) Property changes on: projects/netbsd-tests-update-12/gnu/usr.bin/cc/cc_tools ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/cc/cc_tools:r303899-305031 Index: projects/netbsd-tests-update-12/gnu/usr.bin/gdb =================================================================== --- projects/netbsd-tests-update-12/gnu/usr.bin/gdb (revision 305317) +++ projects/netbsd-tests-update-12/gnu/usr.bin/gdb (revision 305318) Property changes on: projects/netbsd-tests-update-12/gnu/usr.bin/gdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/gdb:r303899-305031 Index: projects/netbsd-tests-update-12/lib/libc/locale/ascii.c =================================================================== --- projects/netbsd-tests-update-12/lib/libc/locale/ascii.c (revision 305317) +++ projects/netbsd-tests-update-12/lib/libc/locale/ascii.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/lib/libc/locale/ascii.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc/locale/ascii.c:r303899-305031 Index: projects/netbsd-tests-update-12/sys/contrib/dev/acpica =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/dev/acpica (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/dev/acpica (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/dev/acpica ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/dev/acpica:r303899-305031 Index: projects/netbsd-tests-update-12/sys/contrib/ipfilter =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/ipfilter (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/ipfilter (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/ipfilter ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/ipfilter:r305014-305031 Index: projects/netbsd-tests-update-12/sys/contrib/libfdt =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/libfdt (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/libfdt (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/libfdt ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/libfdt:r303899-305031 Index: projects/netbsd-tests-update-12/sys/contrib/octeon-sdk =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/octeon-sdk (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/octeon-sdk (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/octeon-sdk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/octeon-sdk:r303899-305031 Index: projects/netbsd-tests-update-12/sys/contrib/x86emu =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/x86emu (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/x86emu (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/x86emu ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/x86emu:r303899-305031 Index: projects/netbsd-tests-update-12/sys/contrib/xz-embedded =================================================================== --- projects/netbsd-tests-update-12/sys/contrib/xz-embedded (revision 305317) +++ projects/netbsd-tests-update-12/sys/contrib/xz-embedded (revision 305318) Property changes on: projects/netbsd-tests-update-12/sys/contrib/xz-embedded ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/xz-embedded:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/atkbdc.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/atkbdc.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/atkbdc.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/atkbdc.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/atkbdc.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/bhyvegc.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/bhyvegc.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/bhyvegc.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/console.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/console.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/console.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/console.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/console.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/console.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/console.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/console.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/console.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/console.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_fbuf.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_fbuf.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_fbuf.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_fbuf.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/pci_fbuf.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/pci_xhci.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_xhci.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/pci_xhci.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/ps2kbd.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2kbd.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/ps2kbd.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/ps2mouse.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/ps2mouse.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/ps2mouse.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/rfb.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/rfb.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/rfb.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/sockstream.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/sockstream.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/sockstream.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/usb_emul.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_emul.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/usb_emul.h:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_mouse.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_mouse.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_mouse.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/usb_mouse.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/usb_mouse.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.c =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.c (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.c (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/vga.c:r303899-305031 Index: projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.h =================================================================== --- projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.h (revision 305317) +++ projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.h (revision 305318) Property changes on: projects/netbsd-tests-update-12/usr.sbin/bhyve/vga.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bhyve/vga.h:r303899-305031