Module Name: src
Committed By: christos
Date: Sat May 25 21:31:29 UTC 2019
Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/include: config.h
Removed Files:
src/external/bsd/unbound/dist/testdata/edns_lame.tdir: edns_lame.conf
edns_lame.dsc edns_lame.post edns_lame.pre edns_lame.test
edns_lame.testns
src/external/bsd/unbound/dist/testdata/pylib.tdir: pylib.conf pylib.py
src/external/bsd/unbound/dist/winrc: unbound16.ico unbound48.ico
unbound64.ico unbound64.png
src/external/bsd/unbound/include: config-1.0.h config-1.1.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/config.guess \
src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.conf \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.dsc \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.post \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.pre \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.test \
src/external/bsd/unbound/dist/testdata/edns_lame.tdir/edns_lame.testns
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.conf \
src/external/bsd/unbound/dist/testdata/pylib.tdir/pylib.py
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/unbound/dist/winrc/unbound16.ico \
src/external/bsd/unbound/dist/winrc/unbound48.ico \
src/external/bsd/unbound/dist/winrc/unbound64.ico \
src/external/bsd/unbound/dist/winrc/unbound64.png
cvs rdiff -u -r1.3 -r0 src/external/bsd/unbound/include/config-1.0.h \
src/external/bsd/unbound/include/config-1.1.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/unbound/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
