Module Name: src
Committed By: christos
Date: Sun Jan 10 20:10:45 UTC 2016
Modified Files:
src/external/bsd/dhcp: Makefile.inc
src/external/bsd/dhcp/dist/bind: bind.tar.gz
src/external/bsd/dhcp/dist/client: dhc6.c dhclient.8 dhclient.c
src/external/bsd/dhcp/dist/common: alloc.c bpf.c conflex.c discover.c
dns.c ns_name.c packet.c
src/external/bsd/dhcp/dist/includes: config.h.in dhcpd.h
src/external/bsd/dhcp/dist/includes/omapip: omapip_p.h result.h
src/external/bsd/dhcp/dist/omapip: isclib.c
src/external/bsd/dhcp/dist/relay: dhcrelay.c
src/external/bsd/dhcp/dist/server: confpars.c ddns.c dhcp.c dhcpd.c
dhcpv6.c mdb.c mdb6.c omapi.c
src/external/bsd/dhcp/include: config.h
src/external/bsd/dhcp/lib: Makefile
Removed Files:
src/external/bsd/dhcp/dist: test-driver
src/external/bsd/dhcp/dist/dst: Makefile.am Makefile.in base64.c
dst_api.c dst_internal.h dst_support.c hmac_link.c md5.h md5_dgst.c
md5_locl.h prandom.c
src/external/bsd/dhcp/lib/dst: Makefile
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/dhcp/dist/test-driver
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/dhcp/dist/bind/bind.tar.gz
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcp/dist/client/dhc6.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/client/dhclient.8
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/common/alloc.c \
src/external/bsd/dhcp/dist/common/bpf.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/common/conflex.c \
src/external/bsd/dhcp/dist/common/discover.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/common/dns.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/dist/common/ns_name.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/common/packet.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/dhcp/dist/dst/Makefile.am
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/dhcp/dist/dst/Makefile.in \
src/external/bsd/dhcp/dist/dst/md5_dgst.c
cvs rdiff -u -r1.6 -r0 src/external/bsd/dhcp/dist/dst/base64.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/dhcp/dist/dst/dst_api.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/dhcp/dist/dst/dst_internal.h \
src/external/bsd/dhcp/dist/dst/md5.h \
src/external/bsd/dhcp/dist/dst/md5_locl.h
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/dhcp/dist/dst/dst_support.c \
src/external/bsd/dhcp/dist/dst/hmac_link.c \
src/external/bsd/dhcp/dist/dst/prandom.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/includes/config.h.in
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/dhcp/dist/includes/omapip/omapip_p.h \
src/external/bsd/dhcp/dist/includes/omapip/result.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/omapip/isclib.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/server/confpars.c \
src/external/bsd/dhcp/dist/server/mdb.c \
src/external/bsd/dhcp/dist/server/omapi.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/server/ddns.c \
src/external/bsd/dhcp/dist/server/dhcpd.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/dhcp/dist/server/dhcp.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcp/dist/server/dhcpv6.c \
src/external/bsd/dhcp/dist/server/mdb6.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/include/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcp/lib/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/dhcp/lib/dst/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
