Module Name: src
Committed By: christos
Date: Sun Dec 15 16:16:34 UTC 2019
Modified Files:
src/external/bsd/unbound/dist: config.guess config.sub
src/external/bsd/unbound/dist/util: mini_event.c netevent.c
src/external/bsd/unbound/include: config.h
Removed Files:
src/external/bsd/unbound/dist: .gitattributes .gitignore
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/unbound/dist/.gitattributes
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/unbound/dist/.gitignore
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/unbound/dist/config.guess \
src/external/bsd/unbound/dist/config.sub
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/unbound/dist/util/mini_event.c \
src/external/bsd/unbound/dist/util/netevent.c
cvs rdiff -u -r1.6 -r1.7 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.
