Module Name: src
Committed By: christos
Date: Sat Oct 25 19:06:34 UTC 2014
Modified Files:
src/external/bsd/ppp: ppp2netbsd
src/external/bsd/ppp/dist/chat: chat.8 chat.c
src/external/bsd/ppp/dist/pppd: auth.c cbcp.c cbcp.h ccp.c ccp.h
chap-md5.c chap-md5.h chap-new.c chap-new.h chap_ms.c chap_ms.h
demand.c eap.c eap.h ecp.c ecp.h eui64.c eui64.h fsm.c fsm.h ipcp.c
ipcp.h ipv6cp.c ipv6cp.h ipxcp.c ipxcp.h lcp.c lcp.h magic.c
magic.h main.c mppe.h multilink.c options.c patchlevel.h
pathnames.h pppcrypt.c pppcrypt.h pppd.8 pppd.h session.c session.h
tty.c upap.c upap.h utils.c
src/external/bsd/ppp/dist/pppdump: deflate.c
src/external/bsd/ppp/dist/pppstats: pppstats.c
src/external/bsd/ppp/usr.sbin/pppd: sys-bsd.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/ppp2netbsd
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/chat/chat.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/chat/chat.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppd/auth.c \
src/external/bsd/ppp/dist/pppd/cbcp.c \
src/external/bsd/ppp/dist/pppd/cbcp.h \
src/external/bsd/ppp/dist/pppd/ccp.c src/external/bsd/ppp/dist/pppd/ccp.h \
src/external/bsd/ppp/dist/pppd/chap-md5.c \
src/external/bsd/ppp/dist/pppd/chap-md5.h \
src/external/bsd/ppp/dist/pppd/chap-new.c \
src/external/bsd/ppp/dist/pppd/chap-new.h \
src/external/bsd/ppp/dist/pppd/chap_ms.c \
src/external/bsd/ppp/dist/pppd/chap_ms.h \
src/external/bsd/ppp/dist/pppd/demand.c \
src/external/bsd/ppp/dist/pppd/eap.c src/external/bsd/ppp/dist/pppd/eap.h \
src/external/bsd/ppp/dist/pppd/ecp.c src/external/bsd/ppp/dist/pppd/ecp.h \
src/external/bsd/ppp/dist/pppd/eui64.c \
src/external/bsd/ppp/dist/pppd/eui64.h \
src/external/bsd/ppp/dist/pppd/fsm.c src/external/bsd/ppp/dist/pppd/fsm.h \
src/external/bsd/ppp/dist/pppd/ipcp.c \
src/external/bsd/ppp/dist/pppd/ipcp.h \
src/external/bsd/ppp/dist/pppd/ipv6cp.c \
src/external/bsd/ppp/dist/pppd/ipv6cp.h \
src/external/bsd/ppp/dist/pppd/ipxcp.c \
src/external/bsd/ppp/dist/pppd/ipxcp.h \
src/external/bsd/ppp/dist/pppd/lcp.c src/external/bsd/ppp/dist/pppd/lcp.h \
src/external/bsd/ppp/dist/pppd/magic.c \
src/external/bsd/ppp/dist/pppd/magic.h \
src/external/bsd/ppp/dist/pppd/mppe.h \
src/external/bsd/ppp/dist/pppd/multilink.c \
src/external/bsd/ppp/dist/pppd/options.c \
src/external/bsd/ppp/dist/pppd/patchlevel.h \
src/external/bsd/ppp/dist/pppd/pathnames.h \
src/external/bsd/ppp/dist/pppd/pppcrypt.c \
src/external/bsd/ppp/dist/pppd/pppcrypt.h \
src/external/bsd/ppp/dist/pppd/pppd.8 \
src/external/bsd/ppp/dist/pppd/pppd.h \
src/external/bsd/ppp/dist/pppd/session.c \
src/external/bsd/ppp/dist/pppd/session.h \
src/external/bsd/ppp/dist/pppd/tty.c \
src/external/bsd/ppp/dist/pppd/upap.c \
src/external/bsd/ppp/dist/pppd/upap.h \
src/external/bsd/ppp/dist/pppd/utils.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ppp/dist/pppd/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppdump/deflate.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ppp/dist/pppstats/pppstats.c
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ppp/usr.sbin/pppd/sys-bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
