Module Name: src
Committed By: christos
Date: Mon Sep 3 14:36:04 UTC 2018
Modified Files:
src/external/bsd/unbound/include: config-1.0.h config-1.1.h
Removed Files:
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir:
._bad_control.key ._bad_control.pem ._bad_server.key
._bad_server.pem ._ctrl_pipe.conf ._ctrl_pipe.dsc ._ctrl_pipe.post
._ctrl_pipe.pre ._ctrl_pipe.test ._ctrl_pipe.testns
._unbound_control.key ._unbound_control.pem ._unbound_server.key
._unbound_server.pem
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.key \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_control.pem \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.key \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._bad_server.pem \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.conf \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.dsc \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.post \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.pre \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.test \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._ctrl_pipe.testns \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.key
\
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_control.pem
\
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.key \
src/external/bsd/unbound/dist/testdata/ctrl_pipe.tdir/._unbound_server.pem
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/include/config-1.0.h \
src/external/bsd/unbound/include/config-1.1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
