Module Name: src
Committed By: christos
Date: Sun Jan 14 19:37:36 UTC 2018
Modified Files:
src/external/apache2/mDNSResponder: prepare-import.sh
src/external/apache2/mDNSResponder/dist/Clients: dns-sd.c
src/external/apache2/mDNSResponder/dist/mDNSCore: DNSCommon.c
DNSDigest.c mDNS.c mDNSEmbeddedAPI.h uDNS.c
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
mDNSPosix.c mDNSUNP.c
src/external/apache2/mDNSResponder/dist/mDNSShared: PlatformCommon.c
dns-sd.1 dns_sd.h dnssd_clientlib.c dnssd_clientstub.c dnssd_ipc.h
uds_daemon.c
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c \
src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
